Commit a1560fd8 authored by jam@chromium.org's avatar jam@chromium.org

Make browser_tests early exit on Linux Aura. This way we can enable them on...

Make browser_tests early exit on Linux Aura. This way we can enable them on the try and buildbots now, and send tryjobs as failing tests are disabled.

BUG=163931
Review URL: https://codereview.chromium.org/11308323

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170781 0039d316-1c4b-4281-b951-d872f2087c98
parent e4d2579a
...@@ -110,10 +110,14 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate { ...@@ -110,10 +110,14 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
}; };
int main(int argc, char** argv) { int main(int argc, char** argv) {
// http://crbug.com/163931 Disabled until browser_tests ready on Linux Aura.
#if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)
return 0;
#endif
#if defined(OS_WIN) && defined(USE_AURA) #if defined(OS_WIN) && defined(USE_AURA)
wchar_t filename[MAX_PATH]; wchar_t filename[MAX_PATH];
GetModuleFileName(NULL, filename, MAX_PATH); GetModuleFileName(NULL, filename, MAX_PATH);
// TODO(jam): early exit until interactive_ui_tests are green. // http://crbug.com/154081: early exit until interactive_ui_tests are green.
if (EndsWith(filename, L"interactive_ui_tests.exe", false)) { if (EndsWith(filename, L"interactive_ui_tests.exe", false)) {
LOG(INFO) << "interactive_ui_tests on win aura are not ready yet."; LOG(INFO) << "interactive_ui_tests on win aura are not ready yet.";
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment