summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-12 19:11:50 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-12 19:11:50 +0000
commit98a8075f0da76bcf320a129c1ac52733dd70c931 (patch)
tree8b0a916d11e8f12600a014875458db27c92ab9e2 /chrome/worker
parent022132ceb7f9aacdfe8ac750bd8ebc6a41eed065 (diff)
downloadchromium_src-98a8075f0da76bcf320a129c1ac52733dd70c931.zip
chromium_src-98a8075f0da76bcf320a129c1ac52733dd70c931.tar.gz
chromium_src-98a8075f0da76bcf320a129c1ac52733dd70c931.tar.bz2
Disable crashing test on linux
BUG=22898 TEST=none TBR=levin Review URL: http://codereview.chromium.org/495011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34430 0039d316-1c4b-4281-b951-d872f2087c98
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