summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 18:33:37 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 18:33:37 +0000
commitdd977f7f4b35709713cfe7ea4ce4cc752fffa9ea (patch)
tree171d44b944801aed8108fcafc117c4a89b96ede8 /sync
parent5333abe823664022e1e1e86e7bfb49cc8d6352c7 (diff)
downloadchromium_src-dd977f7f4b35709713cfe7ea4ce4cc752fffa9ea.zip
chromium_src-dd977f7f4b35709713cfe7ea4ce4cc752fffa9ea.tar.gz
chromium_src-dd977f7f4b35709713cfe7ea4ce4cc752fffa9ea.tar.bz2
Disable InvalidationNotifierTest.Basic on Linux and Mac
TBR=akalin@chromium.org BUG=119467 Review URL: https://chromiumcodereview.appspot.com/10231008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-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;