summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-08 19:57:20 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-08 19:57:20 +0000
commitc0d9ebb8cd577f3040e0bf0a51b01f68d332f4e4 (patch)
tree62297d7b2c0ca362661c03148e4944b11ae52434 /chrome/worker
parent60faa5b7ea9112715aaa6e3db1c4b1afa36ac956 (diff)
downloadchromium_src-c0d9ebb8cd577f3040e0bf0a51b01f68d332f4e4.zip
chromium_src-c0d9ebb8cd577f3040e0bf0a51b01f68d332f4e4.tar.gz
chromium_src-c0d9ebb8cd577f3040e0bf0a51b01f68d332f4e4.tar.bz2
Disable crashy WorkerTest.WorkerFastLayoutTests{0,1,2}
TBR=dimich TEST=stop crashing now! BUG=22898, 35023 Review URL: http://codereview.chromium.org/590002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc19
1 files changed, 6 insertions, 13 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index e6a9377..47054f3 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -216,27 +216,20 @@ TEST_F(WorkerTest, SharedWorkerHttpAuth) {
// dialogs displayed by non-navigating tabs.
}
-#if defined(OS_LINUX)
-// Crashes on Linux - http://crbug.com/22898
-#define WorkerFastLayoutTests0 DISABLED_WorkerFastLayoutTests0
-#define WorkerFastLayoutTests1 DISABLED_WorkerFastLayoutTests1
-#define WorkerFastLayoutTests2 DISABLED_WorkerFastLayoutTests2
-#elif defined(OS_MACOSX)
-// Flaky on Mac - http://crbug.com/28445
-#define WorkerFastLayoutTests0 FLAKY_WorkerFastLayoutTests0
-#endif
-
-TEST_F(WorkerTest, WorkerFastLayoutTests0) {
+// Crashy, see http://crbug.com/22898, http://crbug.com/35023.
+TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests0) {
SCOPED_TRACE("");
RunWorkerFastLayoutTests(0);
}
-TEST_F(WorkerTest, WorkerFastLayoutTests1) {
+// Crashy, see http://crbug.com/22898, http://crbug.com/35023.
+TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests1) {
SCOPED_TRACE("");
RunWorkerFastLayoutTests(1);
}
-TEST_F(WorkerTest, WorkerFastLayoutTests2) {
+// Crashy, see http://crbug.com/22898, http://crbug.com/35023.
+TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests2) {
SCOPED_TRACE("");
RunWorkerFastLayoutTests(2);
}