summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 00:52:58 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 00:52:58 +0000
commit60b24d6b11f2a1efe879d6fdb5a267c14ea4347d (patch)
treeef8916b28519cb97d1d45316fb46dc557fd6ffd6 /content
parent0ca7375e7be484cdd5839ac16946961f7775a893 (diff)
downloadchromium_src-60b24d6b11f2a1efe879d6fdb5a267c14ea4347d.zip
chromium_src-60b24d6b11f2a1efe879d6fdb5a267c14ea4347d.tar.gz
chromium_src-60b24d6b11f2a1efe879d6fdb5a267c14ea4347d.tar.bz2
Mark even more worker_ui_tests as flaky.
TBR=dsolomov@chromium.org Review URL: http://codereview.chromium.org/8533003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/worker/test/worker_uitest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc
index 28ef65b..6ba0e8b 100644
--- a/content/worker/test/worker_uitest.cc
+++ b/content/worker/test/worker_uitest.cc
@@ -259,7 +259,7 @@ TEST_F(WorkerTest, StressJSExecution) {
RunWorkerFastLayoutTest("stress-js-execution.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996
#define UseMachineStack FLAKY_UseMachineStack
#endif
@@ -318,7 +318,7 @@ TEST_F(WorkerTest, WorkerEventListener) {
RunWorkerFastLayoutTest("worker-event-listener.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerGC FLAKY_WorkerGC
#endif
@@ -326,7 +326,7 @@ TEST_F(WorkerTest, WorkerGC) {
RunWorkerFastLayoutTest("worker-gc.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerInit FLAKY_WorkerInit
#endif
@@ -340,7 +340,7 @@ TEST_F(WorkerTest, DISABLED_WorkerLifecycle) {
RunWorkerFastLayoutTest("worker-lifecycle.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerLocation FLAKY_WorkerLocation
#endif
@@ -353,7 +353,7 @@ TEST_F(WorkerTest, FLAKY_WorkerMapGc) {
RunWorkerFastLayoutTest("wrapper-map-gc.html");
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
#define WorkerMessagePort FLAKY_WorkerMessagePort
#endif