summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 02:02:38 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 02:02:38 +0000
commitfcd6b6932f504278d558c1c15f9fb44418cc50f1 (patch)
tree04ec4651f2df91cad7e5bc662056b21248e54673 /chrome/worker
parent5d1937bb5d9137cbaa1c947c383c3742179062a9 (diff)
downloadchromium_src-fcd6b6932f504278d558c1c15f9fb44418cc50f1.zip
chromium_src-fcd6b6932f504278d558c1c15f9fb44418cc50f1.tar.gz
chromium_src-fcd6b6932f504278d558c1c15f9fb44418cc50f1.tar.bz2
Mark worker tests as flaky on mac.
TBR=jianli BUG=28445 TEST=SharedWorkerFastLayoutTest, WorkerFastLayoutTests Review URL: http://codereview.chromium.org/429001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index f1a0a59..0e88ace 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -61,6 +61,8 @@ TEST_F(WorkerTest, MultipleWorkers) {
#if defined(OS_LINUX)
#define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests
+#elif defined(OS_MACOSX)
+#define WorkerFastLayoutTests FLAKY_WorkerFastLayoutTests
#endif
TEST_F(WorkerTest, WorkerFastLayoutTests) {
@@ -113,6 +115,8 @@ TEST_F(WorkerTest, WorkerFastLayoutTests) {
// http://crbug.com/27636 - incorrect URL_MISMATCH exceptions sometimes get
// generated on the windows try bots.
#define SharedWorkerFastLayoutTests DISABLED_SharedWorkerFastLayoutTests
+#elif defined(OS_MACOSX)
+#define SharedWorkerFastLayoutTests FLAKY_SharedWorkerFastLayoutTests
#endif
TEST_F(WorkerTest, SharedWorkerFastLayoutTests) {