Index: mojo/system/simple_dispatcher_unittest.cc |
diff --git a/mojo/system/simple_dispatcher_unittest.cc b/mojo/system/simple_dispatcher_unittest.cc |
index 83692b7c321d44f0d1b6b70a5a74e811d14275d7..648cab9f5f3461748481abe28bfe449f288cef92 100644 |
--- a/mojo/system/simple_dispatcher_unittest.cc |
+++ b/mojo/system/simple_dispatcher_unittest.cc |
@@ -87,7 +87,13 @@ class MockSimpleDispatcher : public SimpleDispatcher { |
DISALLOW_COPY_AND_ASSIGN(MockSimpleDispatcher); |
}; |
-TEST(SimpleDispatcherTest, Basic) { |
+#if defined(OS_WIN) |
+// http://crbug.com/396404 |
+#define MAYBE_Basic DISABLED_Basic |
+#else |
+#define MAYBE_Basic Basic |
+#endif |
+TEST(SimpleDispatcherTest, MAYBE_Basic) { |
test::Stopwatch stopwatch; |
scoped_refptr<MockSimpleDispatcher> d(new MockSimpleDispatcher()); |
@@ -268,7 +274,13 @@ TEST(SimpleDispatcherTest, BasicClosed) { |
// Don't need to remove waiters from closed dispatchers. |
} |
-TEST(SimpleDispatcherTest, BasicThreaded) { |
+#if defined(OS_WIN) |
+// http://crbug.com/396393 |
+#define MAYBE_BasicThreaded DISABLED_BasicThreaded |
+#else |
+#define MAYBE_BasicThreaded BasicThreaded |
+#endif |
+TEST(SimpleDispatcherTest, MAYBE_BasicThreaded) { |
test::Stopwatch stopwatch; |
bool did_wait; |
MojoResult result; |
@@ -381,7 +393,13 @@ TEST(SimpleDispatcherTest, BasicThreaded) { |
EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, result); |
} |
-TEST(SimpleDispatcherTest, MultipleWaiters) { |
+#if defined(OS_WIN) |
+// http://crbug.com/387124 |
+#define MAYBE_MultipleWaiters DISABLED_MultipleWaiters |
+#else |
+#define MAYBE_MultipleWaiters MultipleWaiters |
+#endif |
+TEST(SimpleDispatcherTest, MAYBE_MultipleWaiters) { |
static const uint32_t kNumWaiters = 20; |
bool did_wait[kNumWaiters]; |