diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 09:07:56 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 09:07:56 +0000 |
| commit | e534606c8def60626aae0cc682a2525132e35a44 (patch) | |
| tree | f8c2589988e78e520e0bf2ffca08ff449a9ee90b /content/worker | |
| parent | 1aa603be1718d210ae45c2c938439c875594c94f (diff) | |
| download | chromium_src-e534606c8def60626aae0cc682a2525132e35a44.zip chromium_src-e534606c8def60626aae0cc682a2525132e35a44.tar.gz chromium_src-e534606c8def60626aae0cc682a2525132e35a44.tar.bz2 | |
Fix a few places using OS_MAC instead of OS_MACOSX to disable flaky/failing tests
BUG=86562,86550,88958,48664,28445
TEST=none
TBR=jam,akalin
Review URL: http://codereview.chromium.org/7365002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
| -rw-r--r-- | content/worker/test/worker_uitest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index aaad400..ef23e20 100644 --- a/content/worker/test/worker_uitest.cc +++ b/content/worker/test/worker_uitest.cc @@ -557,7 +557,7 @@ TEST_F(WorkerTest, FLAKY_MessagePorts) { RunLayoutTest(kLayoutTestFiles[i], kNoHttpPort); } -#if defined(OS_MAC) +#if defined(OS_MACOSX) // See http://crbug.com/48664 #define MAYBE_LimitPerPage DISABLED_LimitPerPage #else @@ -579,7 +579,7 @@ TEST_F(WorkerTest, MAYBE_LimitPerPage) { #if defined(OS_LINUX) // Hangs on Linux: http://crbug.com/30332 #define FLAKY_LimitTotal DISABLED_LimitTotal -#elif defined(OS_MAC) +#elif defined(OS_MACOSX) // Possibly causing ui_tests to hang on Mac: http://crbug.com/88958 #define FLAKY_LimitTotal DISABLED_LimitTotal #endif |