summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 09:07:56 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 09:07:56 +0000
commite534606c8def60626aae0cc682a2525132e35a44 (patch)
treef8c2589988e78e520e0bf2ffca08ff449a9ee90b /net
parent1aa603be1718d210ae45c2c938439c875594c94f (diff)
downloadchromium_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 'net')
-rw-r--r--net/socket/transport_client_socket_pool_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index c8d6c90..311828c 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -997,7 +997,7 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketCancel) {
//
// Flaky on Mac - http://crbug.com/86550
// Flaky on ChromeOS - http://crbug.com/89273
-#if defined(OS_MAC) || defined(OS_CHROMEOS)
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
#define MAYBE_BackupSocketFailAfterStall FLAKY_BackupSocketFailAfterStall
#else
#define MAYBE_BackupSocketFailAfterStall BackupSocketFailAfterStall