| Index: base/synchronization/condition_variable_unittest.cc
|
| diff --git a/base/synchronization/condition_variable_unittest.cc b/base/synchronization/condition_variable_unittest.cc
|
| index 584df90c276bfad7d555e6f9a31785a02f52bf28..49716e1e9c0d354dcf03a4911c97aa211c1c599f 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.
|
|
|
|
|