diff options
| author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 22:02:39 +0000 |
|---|---|---|
| committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 22:02:39 +0000 |
| commit | d2dd231fb55e69a870c1b2fc2a4ed1918ccafce6 (patch) | |
| tree | 09582330637ed3af49d6bafb253e165e3c392318 /content/worker | |
| parent | 61941221b25a7a45148205c4e735382200758f25 (diff) | |
| download | chromium_src-d2dd231fb55e69a870c1b2fc2a4ed1918ccafce6.zip chromium_src-d2dd231fb55e69a870c1b2fc2a4ed1918ccafce6.tar.gz chromium_src-d2dd231fb55e69a870c1b2fc2a4ed1918ccafce6.tar.bz2 | |
Mark WorkerTimeout as flake on mac
BUG=101996
TBR=dsolomov@chormium.org
Review URL: http://codereview.chromium.org/8526011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
| -rw-r--r-- | content/worker/test/worker_uitest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index 0b2111e..28ef65b 100644 --- a/content/worker/test/worker_uitest.cc +++ b/content/worker/test/worker_uitest.cc @@ -411,7 +411,7 @@ TEST_F(WorkerTest, WorkerTerminate) { RunWorkerFastLayoutTest("worker-terminate.html"); } -#if defined(OS_WIN) +#if defined(OS_MACOSX) || defined(OS_WIN) // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582). #define WorkerTimeout FLAKY_WorkerTimeout #endif |