summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 00:42:19 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 00:42:19 +0000
commita76aeeaf7361f532b7ece5f0760d2f70a898be85 (patch)
tree28ff563105bcded812fa9b71f072a066aaaf9532 /chrome/worker
parent03c31cb6187af91702b6c601fb3ca1bf0f5eb5f9 (diff)
downloadchromium_src-a76aeeaf7361f532b7ece5f0760d2f70a898be85.zip
chromium_src-a76aeeaf7361f532b7ece5f0760d2f70a898be85.tar.gz
chromium_src-a76aeeaf7361f532b7ece5f0760d2f70a898be85.tar.bz2
More fixes for WorkerFastLayoutTests: enable them on Mac and Win, reintroduce Linux guard that was removed by http://codereview.chromium.org/220034, since the test that fails on all platforms was disabled earlier: http://codereview.chromium.org/219033
BUG=none TEST=none TBR=jshin Review URL: http://codereview.chromium.org/224022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 6d267ec..d6b0ee9 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -35,7 +35,13 @@ TEST_F(WorkerTest, MultipleWorkers) {
RunTest(L"multi_worker.html");
}
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests) {
+// WorkerFastLayoutTests works on the linux try servers, but fails on the
+// build bots.
+#if defined(OS_LINUX)
+#define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests
+#endif
+
+TEST_F(WorkerTest, WorkerFastLayoutTests) {
static const char* kLayoutTestFiles[] = {
"stress-js-execution.html",
#if defined(OS_WIN)