summaryrefslogtreecommitdiffstats
path: root/apps/load_and_launch_browsertest.cc
diff options
context:
space:
mode:
authorkjellander@chromium.org <kjellander@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-21 14:41:13 +0000
committerkjellander@chromium.org <kjellander@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-21 14:41:13 +0000
commitd4d551e21eef3daf36d16d13aac80623b0a01f41 (patch)
tree7c25a474b0a646129d6a05d893bae1b303f25fb8 /apps/load_and_launch_browsertest.cc
parent060554ed1134d96deb682542c67fe99bc4b3668e (diff)
downloadchromium_src-d4d551e21eef3daf36d16d13aac80623b0a01f41.zip
chromium_src-d4d551e21eef3daf36d16d13aac80623b0a01f41.tar.gz
chromium_src-d4d551e21eef3daf36d16d13aac80623b0a01f41.tar.bz2
Disable LoadAndLaunchAppChromeNotRunning for Linux Aura
The PlatformAppLoadAndLaunchBrowserTest.LoadAndLaunchAppChromeNotRunning test hangs on Linux Aura 7 times out of 10 in the revision range 236425:236499. For details, see http://build.chromium.org/p/chromium.linux/builders/Linux%20Aura/builds/11485 http://build.chromium.org/p/chromium.linux/builders/Linux%20Aura/builds/11487 http://build.chromium.org/p/chromium.linux/builders/Linux%20Aura/builds/11488 http://build.chromium.org/p/chromium.linux/builders/Linux%20Aura/builds/11489 http://build.chromium.org/p/chromium.linux/builders/Linux%20Aura/builds/11490 http://build.chromium.org/p/chromium.linux/builders/Linux%20Aura/builds/11492 NOTRY=True BUG=176897 TEST=local compile TBR=benwells@chromium.org Review URL: https://codereview.chromium.org/78393004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/load_and_launch_browsertest.cc')
-rw-r--r--apps/load_and_launch_browsertest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/load_and_launch_browsertest.cc b/apps/load_and_launch_browsertest.cc
index 40f748c..e9814e9 100644
--- a/apps/load_and_launch_browsertest.cc
+++ b/apps/load_and_launch_browsertest.cc
@@ -136,8 +136,9 @@ class PlatformAppLoadAndLaunchBrowserTest : public PlatformAppBrowserTest {
} // namespace
-// TODO(jackhou): Make this test not flaky on Vista. See http://crbug.com/176897
-#if defined(OS_WIN)
+// TODO(jackhou): Make this test not flaky on Vista or Linux Aura. See
+// http://crbug.com/176897
+#if defined(OS_WIN) || (defined(OS_LINUX) && defined(USE_AURA))
#define MAYBE_LoadAndLaunchAppChromeNotRunning \
DISABLED_LoadAndLaunchAppChromeNotRunning
#else