summaryrefslogtreecommitdiffstats
path: root/chrome/browser/first_run
diff options
context:
space:
mode:
authortapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 00:52:38 +0000
committertapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 00:52:38 +0000
commit431ad7bb398c4ab69ec14447a166d7c7dd841b16 (patch)
tree6874732a974c400b74973c88e6d27705ac76a025 /chrome/browser/first_run
parentcff19c16987bc2c418157a1dd23dd365625684f5 (diff)
downloadchromium_src-431ad7bb398c4ab69ec14447a166d7c7dd841b16.zip
chromium_src-431ad7bb398c4ab69ec14447a166d7c7dd841b16.tar.gz
chromium_src-431ad7bb398c4ab69ec14447a166d7c7dd841b16.tar.bz2
Disable FirstRunIntegrationBrowserTest.WaitForImport on mac_asan.
Flakily fails on try jobs. BUG=181499 Review URL: https://chromiumcodereview.appspot.com/12718003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
-rw-r--r--chrome/browser/first_run/first_run_browsertest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc
index 8c7d05f..07015a1 100644
--- a/chrome/browser/first_run/first_run_browsertest.cc
+++ b/chrome/browser/first_run/first_run_browsertest.cc
@@ -122,7 +122,9 @@ class FirstRunMasterPrefsBrowserTest : public FirstRunIntegrationBrowserTest {
// TODO(tapted): Investigate why this fails on Linux bots but does not
// reproduce locally. See http://crbug.com/178062 .
-#if defined(OS_LINUX)
+// TODO(tapted): Investigate why this fails on mac_asan flakily
+// http://crbug.com/181499 .
+#if defined(OS_LINUX) || (defined(OS_MACOSX) && defined(ADDRESS_SANITIZER))
#define MAYBE_WaitForImport DISABLED_WaitForImport
#else
#define MAYBE_WaitForImport WaitForImport