summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-08 20:41:45 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-08 20:41:45 +0000
commitf972bb64547f2c177e2968cae838a42eb0c23b3f (patch)
treee7d65a18647e2fa526a153f461e35e00bf286a86
parent955fc2e75864c1202c399d75c2351f01fba0a9a0 (diff)
downloadchromium_src-f972bb64547f2c177e2968cae838a42eb0c23b3f.zip
chromium_src-f972bb64547f2c177e2968cae838a42eb0c23b3f.tar.gz
chromium_src-f972bb64547f2c177e2968cae838a42eb0c23b3f.tar.bz2
Re-enable worker tests on Windows (partial revert of r38378)
BUG=35023 TEST=enabled some. Review URL: http://codereview.chromium.org/588003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38387 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/worker/worker_uitest.cc15
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 47054f3..7f7756f 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -216,20 +216,27 @@ TEST_F(WorkerTest, SharedWorkerHttpAuth) {
// dialogs displayed by non-navigating tabs.
}
-// Crashy, see http://crbug.com/22898, http://crbug.com/35023.
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests0) {
+// Crashy on Linux and Mac, see http://crbug.com/28445, http://crbug.com/22898,
+// http://crbug.com/35023.
+#if defined(OS_LINUX) || defined(OS_MACOSX)
+#define WorkerFastLayoutTests0 DISABLED_WorkerFastLayoutTests0
+#define WorkerFastLayoutTests1 DISABLED_WorkerFastLayoutTests1
+#define WorkerFastLayoutTests2 DISABLED_WorkerFastLayoutTests2
+#endif
+
+TEST_F(WorkerTest, WorkerFastLayoutTests0) {
SCOPED_TRACE("");
RunWorkerFastLayoutTests(0);
}
// Crashy, see http://crbug.com/22898, http://crbug.com/35023.
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests1) {
+TEST_F(WorkerTest, WorkerFastLayoutTests1) {
SCOPED_TRACE("");
RunWorkerFastLayoutTests(1);
}
// Crashy, see http://crbug.com/22898, http://crbug.com/35023.
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests2) {
+TEST_F(WorkerTest, WorkerFastLayoutTests2) {
SCOPED_TRACE("");
RunWorkerFastLayoutTests(2);
}