summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-23 22:13:55 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-23 22:13:55 +0000
commit258bfa76d72d3042b9c6f0213dc7f0691a926847 (patch)
tree6c1b048fb14ff242ced936f8c7b51b845ce1cce1 /chrome/worker
parent85e49550279decaf5ad95c34b66567eeb2dce5bb (diff)
downloadchromium_src-258bfa76d72d3042b9c6f0213dc7f0691a926847.zip
chromium_src-258bfa76d72d3042b9c6f0213dc7f0691a926847.tar.gz
chromium_src-258bfa76d72d3042b9c6f0213dc7f0691a926847.tar.bz2
Disable these only on linux
TBR=levin BUG=28445 Review URL: http://codereview.chromium.org/437021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc19
1 files changed, 15 insertions, 4 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 2fc6986..31633d2 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -52,8 +52,12 @@ class WorkerTest : public UILayoutTest {
};
+#if defined(OS_LINUX)
// Fails running under valgrind, http://crbug.com/28445
-TEST_F(WorkerTest, DISABLED_SingleWorker) {
+#define SingleWorker DISABLED_SingleWorker
+#endif
+
+TEST_F(WorkerTest, SingleWorker) {
RunTest(L"single_worker.html");
}
@@ -186,9 +190,12 @@ TEST_F(WorkerTest, WorkerHttpLayoutTests) {
StopHttpServer();
}
-
+#if defined(OS_LINUX)
// Fails running under valgrind http://crbug.com/28445
-TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) {
+#define WorkerXhrHttpLayoutTests DISABLED_WorkerXhrHttpLayoutTests
+#endif
+
+TEST_F(WorkerTest, WorkerXhrHttpLayoutTests) {
static const char* kLayoutTestFiles[] = {
"abort-exception-assert.html",
#if defined(OS_WIN)
@@ -280,8 +287,12 @@ TEST_F(WorkerTest, LimitPerPage) {
}
#endif
+#if defined(OS_LINUX)
// Fails (crashes) on Linux Tests: http://crbug.com/28445
-TEST_F(WorkerTest, DISABLED_LimitTotal) {
+#define LimitTotal DISABLED_LimitTotal
+#endif
+
+TEST_F(WorkerTest, LimitTotal) {
int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
int total_workers = WorkerService::kMaxWorkersWhenSeparate;