diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 18:29:31 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 18:29:31 +0000 |
| commit | 25067e0761fd5545b4eafaa8880cfc5d81b5e211 (patch) | |
| tree | cad09264cfcda540b7c710d33b3ad4ea615ae2b4 /chrome/worker | |
| parent | d54030f704e1050a052a56515a007e1787793037 (diff) | |
| download | chromium_src-25067e0761fd5545b4eafaa8880cfc5d81b5e211.zip chromium_src-25067e0761fd5545b4eafaa8880cfc5d81b5e211.tar.gz chromium_src-25067e0761fd5545b4eafaa8880cfc5d81b5e211.tar.bz2 | |
Test continues to be flaky, but it's getting run anyway so mark it DISABLED to keep things green.
TBR=levin
BUG=28445
Review URL: http://codereview.chromium.org/437008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 8f6cbd7..b8d9740 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -59,10 +59,8 @@ TEST_F(WorkerTest, MultipleWorkers) { RunTest(L"multi_worker.html"); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined (OS_MACOSX) #define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests -#elif defined(OS_MACOSX) -#define WorkerFastLayoutTests FLAKY_WorkerFastLayoutTests #endif TEST_F(WorkerTest, WorkerFastLayoutTests) { @@ -111,12 +109,11 @@ TEST_F(WorkerTest, WorkerFastLayoutTests) { RunLayoutTest(kLayoutTestFiles[i], false); } -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_MACOSX) // http://crbug.com/27636 - incorrect URL_MISMATCH exceptions sometimes get // generated on the windows try bots. +// http://crbug.com/28445 - flakiness on mac #define SharedWorkerFastLayoutTests DISABLED_SharedWorkerFastLayoutTests -#elif defined(OS_MACOSX) -#define SharedWorkerFastLayoutTests FLAKY_SharedWorkerFastLayoutTests #endif TEST_F(WorkerTest, SharedWorkerFastLayoutTests) { |