summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 06:26:00 +0000
committerdumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 06:26:00 +0000
commit95b90efbf3bf417de1daa6df8bca3c19b3e219fb (patch)
tree65e83589fdaba4f0242d7525dac9c13b5a0386d3
parent41ae43aad8f6d0306a0a851bac94b208057fd455 (diff)
downloadchromium_src-95b90efbf3bf417de1daa6df8bca3c19b3e219fb.zip
chromium_src-95b90efbf3bf417de1daa6df8bca3c19b3e219fb.tar.gz
chromium_src-95b90efbf3bf417de1daa6df8bca3c19b3e219fb.tar.bz2
Disable WorkerTest.WorkerSocketLayoutTests on all platforms.
BUG=40995 TEST=none TBR=ukai Review URL: http://codereview.chromium.org/1542028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44332 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/worker/worker_uitest.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index d300a5e..e59580b 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -393,11 +393,8 @@ TEST_F(WorkerTest, FLAKY_WorkerHttpLayoutTests) {
StopHttpServer();
}
-// http://crbug.com/40995: Fails on the Linux perf bot for unknown reasons.
-#if defined(OS_LINUX)
-#define WorkerWebSocketLayoutTests DISABLED_WorkerWebSocketLayoutTests
-#endif
-TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
+// http://crbug.com/40995
+TEST_F(WorkerTest, DISABLED_WorkerWebSocketLayoutTests) {
static const char* kLayoutTestFiles[] = {
"worker-simple.html",
"shared-worker-simple.html",