summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 20:38:33 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 20:38:33 +0000
commit7b3c0312746e6f21478a01c3d56db4714b48618f (patch)
treead0ffa075bb5afbfbdbe7847a76c5e64fed71dfc /chrome/worker
parentb2f030c9ca8976b71264657f77c71cdb6249f66c (diff)
downloadchromium_src-7b3c0312746e6f21478a01c3d56db4714b48618f.zip
chromium_src-7b3c0312746e6f21478a01c3d56db4714b48618f.tar.gz
chromium_src-7b3c0312746e6f21478a01c3d56db4714b48618f.tar.bz2
Re-enable WorkerFastTests and disable only one that fails.
BUG=22947 TEST=none Review URL: http://codereview.chromium.org/219033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 3431cba..f18ea0f 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -35,8 +35,7 @@ TEST_F(WorkerTest, MultipleWorkers) {
RunTest(L"multi_worker.html");
}
-// This fails on all platforms. Disable it for now. See http://crbug.com/22942
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests) {
+TEST_F(WorkerTest, WorkerFastLayoutTests) {
static const char* kLayoutTestFiles[] = {
"stress-js-execution.html",
#if defined(OS_WIN)
@@ -61,7 +60,8 @@ TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests) {
// "worker-lifecycle.html",
"worker-location.html",
"worker-messageport.html",
- "worker-messageport-gc.html",
+ // Disabled after r27089 (WebKit merge), http://crbug.com/22947
+ // "worker-messageport-gc.html",
"worker-multi-port.html",
"worker-navigator.html",
"worker-replace-global-constructor.html",