summaryrefslogtreecommitdiffstats
path: root/base/threading/worker_pool_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'base/threading/worker_pool_unittest.cc')
-rw-r--r--base/threading/worker_pool_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc
index 0452335..5f94e73 100644
--- a/base/threading/worker_pool_unittest.cc
+++ b/base/threading/worker_pool_unittest.cc
@@ -83,7 +83,14 @@ TEST_F(WorkerPoolTest, PostTask) {
long_test_event.Wait();
}
-TEST_F(WorkerPoolTest, PostTaskAndReply) {
+#if defined(OS_WIN) || defined(OS_LINUX)
+// Flaky on Windows and Linux (http://crbug.com/130337)
+#define MAYBE_PostTaskAndReply DISABLED_PostTaskAndReply
+#else
+#define MAYBE_PostTaskAndReply PostTaskAndReply
+#endif
+
+TEST_F(WorkerPoolTest, MAYBE_PostTaskAndReply) {
MessageLoop message_loop;
scoped_refptr<PostTaskAndReplyTester> tester(new PostTaskAndReplyTester());
tester->RunTest();