Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1086)

Side by Side Diff: chrome/test/base/chrome_test_launcher.cc

Issue 11308323: Make browser_tests early exit on Linux Aura. This way we can enable them on the try and buildbots n… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/test/test_launcher.h" 5 #include "content/public/test/test_launcher.h"
6 6
7 #include <stack> 7 #include <stack>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 private: 104 private:
105 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS) 105 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
106 std::stack<linked_ptr<views::AcceleratorHandler> > handlers_; 106 std::stack<linked_ptr<views::AcceleratorHandler> > handlers_;
107 #endif 107 #endif
108 108
109 DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate); 109 DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate);
110 }; 110 };
111 111
112 int main(int argc, char** argv) { 112 int main(int argc, char** argv) {
113 // http://crbug.com/163931 Disabled until browser_tests ready on Linux Aura.
114 #if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)
115 return 0;
116 #endif
113 #if defined(OS_WIN) && defined(USE_AURA) 117 #if defined(OS_WIN) && defined(USE_AURA)
114 wchar_t filename[MAX_PATH]; 118 wchar_t filename[MAX_PATH];
115 GetModuleFileName(NULL, filename, MAX_PATH); 119 GetModuleFileName(NULL, filename, MAX_PATH);
116 // TODO(jam): early exit until interactive_ui_tests are green. 120 // http://crbug.com/154081: early exit until interactive_ui_tests are green.
117 if (EndsWith(filename, L"interactive_ui_tests.exe", false)) { 121 if (EndsWith(filename, L"interactive_ui_tests.exe", false)) {
118 LOG(INFO) << "interactive_ui_tests on win aura are not ready yet."; 122 LOG(INFO) << "interactive_ui_tests on win aura are not ready yet.";
119 return 0; 123 return 0;
120 } 124 }
121 #endif 125 #endif
122 126
123 #if defined(OS_MACOSX) 127 #if defined(OS_MACOSX)
124 chrome_browser_application_mac::RegisterBrowserCrApp(); 128 chrome_browser_application_mac::RegisterBrowserCrApp();
125 #endif 129 #endif
126 ChromeTestLauncherDelegate launcher_delegate; 130 ChromeTestLauncherDelegate launcher_delegate;
127 return content::LaunchTests(&launcher_delegate, argc, argv); 131 return content::LaunchTests(&launcher_delegate, argc, argv);
128 } 132 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698