From f972bb64547f2c177e2968cae838a42eb0c23b3f Mon Sep 17 00:00:00 2001 From: "dimich@google.com" Date: Mon, 8 Feb 2010 20:41:45 +0000 Subject: Re-enable worker tests on Windows (partial revert of r38378) BUG=35023 TEST=enabled some. Review URL: http://codereview.chromium.org/588003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38387 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/worker/worker_uitest.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'chrome') diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 47054f3..7f7756f 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -216,20 +216,27 @@ TEST_F(WorkerTest, SharedWorkerHttpAuth) { // dialogs displayed by non-navigating tabs. } -// Crashy, see http://crbug.com/22898, http://crbug.com/35023. -TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests0) { +// Crashy on Linux and Mac, see http://crbug.com/28445, http://crbug.com/22898, +// http://crbug.com/35023. +#if defined(OS_LINUX) || defined(OS_MACOSX) +#define WorkerFastLayoutTests0 DISABLED_WorkerFastLayoutTests0 +#define WorkerFastLayoutTests1 DISABLED_WorkerFastLayoutTests1 +#define WorkerFastLayoutTests2 DISABLED_WorkerFastLayoutTests2 +#endif + +TEST_F(WorkerTest, WorkerFastLayoutTests0) { SCOPED_TRACE(""); RunWorkerFastLayoutTests(0); } // Crashy, see http://crbug.com/22898, http://crbug.com/35023. -TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests1) { +TEST_F(WorkerTest, WorkerFastLayoutTests1) { SCOPED_TRACE(""); RunWorkerFastLayoutTests(1); } // Crashy, see http://crbug.com/22898, http://crbug.com/35023. -TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests2) { +TEST_F(WorkerTest, WorkerFastLayoutTests2) { SCOPED_TRACE(""); RunWorkerFastLayoutTests(2); } -- cgit v1.1