summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 0e55d2a..eb5c9e8 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -105,7 +105,10 @@ TEST_F(WorkerTest, IncognitoSharedWorkers) {
RunIncognitoTest(L"incognito_worker.html");
}
-#if defined(OS_LINUX) || defined (OS_MACOSX)
+#if defined(OS_LINUX)
+// Crashes on Linux - http://crbug.com/22898
+#define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests
+#elif defined (OS_MACOSX)
#define WorkerFastLayoutTests FLAKY_WorkerFastLayoutTests
#endif