summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sync/notifier/invalidation_notifier_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc
index 701e133..0788f04c 100644
--- a/sync/notifier/invalidation_notifier_unittest.cc
+++ b/sync/notifier/invalidation_notifier_unittest.cc
@@ -58,7 +58,13 @@ class InvalidationNotifierTest : public testing::Test {
notifier::FakeBaseTask fake_base_task_;
};
-TEST_F(InvalidationNotifierTest, Basic) {
+// Crashes on Linux and Mac, http://crbug.com/119467
+#if defined(OS_LINUX) || defined(OS_MACOSX)
+#define MAYBE_Basic DISABLED_Basic
+#else
+#define MAYBE_Basic Basic
+#endif
+TEST_F(InvalidationNotifierTest, MAYBE_Basic) {
InSequence dummy;
syncable::ModelTypePayloadMap type_payloads;