summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-10 20:12:21 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-10 20:12:21 +0000
commit93d4026613e067afac17c81b12ec6c39a5836ce2 (patch)
tree46bc443dab368d9f036cc0b6978ca5789d39b1b5 /content
parent928ca718dec9bf58bd3bb76b73ca8090e2e8218c (diff)
downloadchromium_src-93d4026613e067afac17c81b12ec6c39a5836ce2.zip
chromium_src-93d4026613e067afac17c81b12ec6c39a5836ce2.tar.gz
chromium_src-93d4026613e067afac17c81b12ec6c39a5836ce2.tar.bz2
Mark more WorkerTest flakiness.
BUG=101996 TBR=dsolomov@chromium.org Review URL: http://codereview.chromium.org/8526007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/worker/test/worker_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc
index f1a1848..0b2111e 100644
--- a/content/worker/test/worker_uitest.cc
+++ b/content/worker/test/worker_uitest.cc
@@ -310,7 +310,7 @@ TEST_F(WorkerTest, WorkerContextMultiPort) {
RunWorkerFastLayoutTest("worker-context-multi-port.html");
}
-#if defined(OS_WIN)
+#if defined(OS_MAC) || defined(OS_WIN)
// http://crbug.com/101996
#define WorkerEventListener FLAKY_WorkerEventListener
#endif
@@ -403,7 +403,7 @@ TEST_F(WorkerTest, WorkerScriptError) {
RunWorkerFastLayoutTest("worker-script-error.html");
}
-#if defined(OS_WIN)
+#if defined(OS_MACOSX) || defined(OS_WIN)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerTerminate FLAKY_WorkerTerminate
#endif