Index: chrome/worker/worker_uitest.cc |
=================================================================== |
--- chrome/worker/worker_uitest.cc (revision 29782) |
+++ chrome/worker/worker_uitest.cc (working copy) |
@@ -58,16 +58,16 @@ |
RunTest(L"multi_worker.html"); |
} |
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests) { |
+#if defined(OS_LINUX) |
+#define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests |
+#endif |
+ |
+TEST_F(WorkerTest, WorkerFastLayoutTests) { |
static const char* kLayoutTestFiles[] = { |
"stress-js-execution.html", |
"use-machine-stack.html", |
"worker-call.html", |
- // Disabled because cloning ports are too slow in Chromium to meet the |
- // thresholds in this test. |
- // http://code.google.com/p/chromium/issues/detail?id=22780 |
- // "worker-cloneport.html", |
- |
+ "worker-cloneport.html", |
"worker-close.html", |
"worker-constructor.html", |
"worker-context-gc.html", |
@@ -87,7 +87,9 @@ |
"worker-replace-self.html", |
"worker-script-error.html", |
"worker-terminate.html", |
- "worker-timeout.html" |
+ // clearInterval() sometimes lets the timer continue to fire |
+ // http://code.google.com/p/chromium/issues/detail?id=25548 |
+ // "worker-timeout.html" |
}; |
FilePath fast_test_dir; |