summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 22:03:31 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 22:03:31 +0000
commita18194ac534a98e9a6527fb3633fa38db9b6459f (patch)
tree02e731d2f750fec4caf4d5bde343b4288fb0627e /base
parenta8e9403449a6869d4ba7f087cea24f24d71da493 (diff)
downloadchromium_src-a18194ac534a98e9a6527fb3633fa38db9b6459f.zip
chromium_src-a18194ac534a98e9a6527fb3633fa38db9b6459f.tar.gz
chromium_src-a18194ac534a98e9a6527fb3633fa38db9b6459f.tar.bz2
Disable WaitableEventWatcherTest.DeleteUnder on win.
BUG=62119 TEST=none Review URL: http://codereview.chromium.org/4565003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/waitable_event_watcher_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/base/waitable_event_watcher_unittest.cc b/base/waitable_event_watcher_unittest.cc
index 86acee0..e6a6ac0 100644
--- a/base/waitable_event_watcher_unittest.cc
+++ b/base/waitable_event_watcher_unittest.cc
@@ -151,7 +151,13 @@ TEST(WaitableEventWatcherTest, OutlivesMessageLoop) {
RunTest_OutlivesMessageLoop(MessageLoop::TYPE_UI);
}
-TEST(WaitableEventWatcherTest, DeleteUnder) {
+#if defined(OS_WIN)
+// Crashes sometimes on vista. http://crbug.com/62119
+#define MAYBE_DeleteUnder DISABLED_DeleteUnder
+#else
+#define MAYBE_DeleteUnder DeleteUnder
+#endif
+TEST(WaitableEventWatcherTest, MAYBE_DeleteUnder) {
RunTest_DeleteUnder(MessageLoop::TYPE_DEFAULT);
RunTest_DeleteUnder(MessageLoop::TYPE_IO);
RunTest_DeleteUnder(MessageLoop::TYPE_UI);