summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 23:31:10 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 23:31:10 +0000
commita893d239a063c32854517f4aac6d48e01aea9748 (patch)
treef9ff7f9a71b93130d10e7a4c75db7296edf0d91a
parent8037cd741e02aca80032f6b77aa8868b57d09a04 (diff)
downloadchromium_src-a893d239a063c32854517f4aac6d48e01aea9748.zip
chromium_src-a893d239a063c32854517f4aac6d48e01aea9748.tar.gz
chromium_src-a893d239a063c32854517f4aac6d48e01aea9748.tar.bz2
More worker ui test supressions
Review URL: http://codereview.chromium.org/8511073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109729 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/worker/test/worker_uitest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc
index 5dbcb05..3c6f105 100644
--- a/content/worker/test/worker_uitest.cc
+++ b/content/worker/test/worker_uitest.cc
@@ -267,7 +267,7 @@ TEST_F(WorkerTest, UseMachineStack) {
RunWorkerFastLayoutTest("use-machine-stack.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996
#define WorkerCall FLAKY_WorkerCall
#endif
@@ -281,7 +281,7 @@ TEST_F(WorkerTest, DISABLED_WorkerClonePort) {
RunWorkerFastLayoutTest("worker-cloneport.html");
}
-#if defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996
#define WorkerCloseFast FLAKY_WorkerCloseFast
#endif
@@ -361,7 +361,7 @@ TEST_F(WorkerTest, WorkerMessagePort) {
RunWorkerFastLayoutTest("worker-messageport.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerMessagePortGC FLAKY_WorkerMessagePortGC
#endif
@@ -386,7 +386,7 @@ TEST_F(WorkerTest, WorkerReplaceGlobalConstructor) {
RunWorkerFastLayoutTest("worker-replace-global-constructor.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerReplaceSelf FLAKY_WorkerReplaceSelf
#endif