summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 15:57:10 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 15:57:10 +0000
commit7f593b65f3d11c6754ca6db19a42df2872338ef2 (patch)
tree77316831436f26c23c9243d1b1b7152b6418c035 /chrome
parent0ed65504e0c79f0e69f4eb8ec7a9568cd839068b (diff)
downloadchromium_src-7f593b65f3d11c6754ca6db19a42df2872338ef2.zip
chromium_src-7f593b65f3d11c6754ca6db19a42df2872338ef2.tar.gz
chromium_src-7f593b65f3d11c6754ca6db19a42df2872338ef2.tar.bz2
Mark ProcessSingletonTest.StartupRaceCondition as failing on Linux
TBR=erikkay BUG=47979 TEST=Greener Linux bots Review URL: http://codereview.chromium.org/2811038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/process_singleton_uitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/process_singleton_uitest.cc b/chrome/browser/process_singleton_uitest.cc
index 50eb1c8..ee8756a 100644
--- a/chrome/browser/process_singleton_uitest.cc
+++ b/chrome/browser/process_singleton_uitest.cc
@@ -193,7 +193,13 @@ class ProcessSingletonTest : public UITest {
base::WaitableEvent threads_waker_;
};
-TEST_F(ProcessSingletonTest, StartupRaceCondition) {
+#if defined(OS_LINUX)
+// http://crbug.com/47979
+#define MAYBE_StartupRaceCondition FAILS_StartupRaceCondition
+#else
+#define MAYBE_StartupRaceCondition StartupRaceCondition
+#endif
+TEST_F(ProcessSingletonTest, MAYBE_StartupRaceCondition) {
// We use this to stop the attempts loop on the first failure.
bool failed = false;
for (size_t attempt = 0; attempt < kNbAttempts && !failed; ++attempt) {