summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 02:27:13 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 02:27:13 +0000
commit716b6b2dc8bc1c497495c276fa3e73418a341e49 (patch)
tree30c367855161021cf5d9d0a3052705a36955bfd5 /chrome/browser/sync
parenta6d5c6da0c3cc34b2cc2b2cd3f15749173a7707d (diff)
downloadchromium_src-716b6b2dc8bc1c497495c276fa3e73418a341e49.zip
chromium_src-716b6b2dc8bc1c497495c276fa3e73418a341e49.tar.gz
chromium_src-716b6b2dc8bc1c497495c276fa3e73418a341e49.tar.bz2
[Sync] Disable passwords perf test on Mac/Win
BUG=105999 TEST= TBR=rsimha Review URL: http://codereview.chromium.org/8763015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc
index 52948b2..e865877 100644
--- a/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc
@@ -71,9 +71,9 @@ std::string PasswordsSyncPerfTest::NextPassword() {
return base::StringPrintf("password%d", password_number_++);
}
-// Flaky on Windows, see http://crbug.com/105787
-#if defined(OS_WIN)
-#define MAYBE_P0 FLAKY_P0
+// Flaky on Windows, timing out on Mac, see http://crbug.com/105999
+#if defined(OS_WIN) || defined(OS_MAC)
+#define MAYBE_P0 DISABLED_P0
#else
#define MAYBE_P0 P0
#endif