diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 12:53:24 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 12:53:24 +0000 |
| commit | 4b10905000003f3708de74054524da17c4c5880b (patch) | |
| tree | 09f8f2b12251f67e09c51d502126e096bebeb24e | |
| parent | ae83ee236aec705987e32120b26fd2f1a626ef87 (diff) | |
| download | chromium_src-4b10905000003f3708de74054524da17c4c5880b.zip chromium_src-4b10905000003f3708de74054524da17c4c5880b.tar.gz chromium_src-4b10905000003f3708de74054524da17c4c5880b.tar.bz2 | |
Marked ExtensionLoadTest.Test as flaky on Linux x64.
BUG=80961
TEST=ExtensionLoadTest.Test
Review URL: http://codereview.chromium.org/6883262
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83506 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_startup_browsertest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index e139365..65dc1d7 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -199,7 +199,14 @@ class ExtensionsLoadTest : public ExtensionStartupTestBase { } }; -IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Test) { +// Fails inconsistently on Linux x64. http://crbug.com/80961 +#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) +#define Maybe_Test FLAKY_Test +#else +#define Maybe_Test Test +#endif + +IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Maybe_Test) { WaitForServicesToStart(1, true); TestInjection(true, true); } |