| OLD | NEW |
| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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. | 113 // http://crbug.com/163931 Disabled until browser_tests ready on Linux Aura. |
| 114 #if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS) | 114 #if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS) |
| 115 return 0; | 115 return 0; |
| 116 #endif | 116 #endif |
| 117 #if defined(OS_WIN) && defined(USE_AURA) | |
| 118 wchar_t filename[MAX_PATH]; | |
| 119 GetModuleFileName(NULL, filename, MAX_PATH); | |
| 120 // http://crbug.com/154081: early exit until interactive_ui_tests are green. | |
| 121 if (EndsWith(filename, L"interactive_ui_tests.exe", false)) { | |
| 122 LOG(INFO) << "interactive_ui_tests on win aura are not ready yet."; | |
| 123 return 0; | |
| 124 } | |
| 125 #endif | |
| 126 | 117 |
| 127 #if defined(OS_MACOSX) | 118 #if defined(OS_MACOSX) |
| 128 chrome_browser_application_mac::RegisterBrowserCrApp(); | 119 chrome_browser_application_mac::RegisterBrowserCrApp(); |
| 129 #endif | 120 #endif |
| 130 ChromeTestLauncherDelegate launcher_delegate; | 121 ChromeTestLauncherDelegate launcher_delegate; |
| 131 return content::LaunchTests(&launcher_delegate, argc, argv); | 122 return content::LaunchTests(&launcher_delegate, argc, argv); |
| 132 } | 123 } |
| OLD | NEW |