summaryrefslogtreecommitdiffstats
path: root/base/synchronization/condition_variable_unittest.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 04:26:52 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 04:26:52 +0000
commit8c321d863b9acd641cb34aaaba8f419cfc0f839b (patch)
tree9546fc932ae7e0e328063b6efc47f3da8ab26312 /base/synchronization/condition_variable_unittest.cc
parent8e43b98ca21de2124acff704bcb44a28d3a9bd27 (diff)
downloadchromium_src-8c321d863b9acd641cb34aaaba8f419cfc0f839b.zip
chromium_src-8c321d863b9acd641cb34aaaba8f419cfc0f839b.tar.gz
chromium_src-8c321d863b9acd641cb34aaaba8f419cfc0f839b.tar.bz2
Disable ConditionVariableTest.MultiThreadConsumerTest on Windows.
It suddenly got flaky around r124275-124280. BUG=10607 TEST=none TBR=jknotten@chromium.org Review URL: https://chromiumcodereview.appspot.com/9557012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/synchronization/condition_variable_unittest.cc')
-rw-r--r--base/synchronization/condition_variable_unittest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/base/synchronization/condition_variable_unittest.cc b/base/synchronization/condition_variable_unittest.cc
index 584df90..49716e1 100644
--- a/base/synchronization/condition_variable_unittest.cc
+++ b/base/synchronization/condition_variable_unittest.cc
@@ -188,8 +188,16 @@ TEST_F(ConditionVariableTest, TimeoutTest) {
lock.Release();
}
+
+// Suddenly got flaky on Win, see http://crbug.com/10607 (starting at
+// comment #15)
+#if defined(OS_WIN)
+#define MAYBE_MultiThreadConsumerTest DISABLED_MultiThreadConsumerTest
+#else
+#define MAYBE_MultiThreadConsumerTest MultiThreadConsumerTest
+#endif
// Test serial task servicing, as well as two parallel task servicing methods.
-TEST_F(ConditionVariableTest, MultiThreadConsumerTest) {
+TEST_F(ConditionVariableTest, MAYBE_MultiThreadConsumerTest) {
const int kThreadCount = 10;
WorkQueue queue(kThreadCount); // Start the threads.