summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormagjed <magjed@chromium.org>2015-08-07 07:39:16 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-07 14:39:59 +0000
commitb483c2b4ad35e2119b2956ece1d4d71dd2631ed3 (patch)
treeca077a178dcf0135ed2cf815c30ef9d4426f1279
parent30eff07169c65fdbaee5291e50b887806fd8b706 (diff)
downloadchromium_src-b483c2b4ad35e2119b2956ece1d4d71dd2631ed3.zip
chromium_src-b483c2b4ad35e2119b2956ece1d4d71dd2631ed3.tar.gz
chromium_src-b483c2b4ad35e2119b2956ece1d4d71dd2631ed3.tar.bz2
Disable InstantExtendedTest.OmniboxMarginSetForSearchURLs on Linux Asan due to flaky crashes at shutdown
BUG=517886 TBR=pkasting@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/1282483002 Cr-Commit-Position: refs/heads/master@{#342353}
-rw-r--r--chrome/browser/ui/search/instant_extended_interactive_uitest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index 3490fc2..7ecfe16 100644
--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -430,7 +430,15 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=puppies"));
}
-IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxMarginSetForSearchURLs) {
+#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
+// Flaky crashes at shutdown on Linux Asan; http://crbug.com/517886.
+#define MAYBE_OmniboxMarginSetForSearchURLs \
+ DISABLED_OmniboxMarginSetForSearchURLs
+#else
+#define MAYBE_OmniboxMarginSetForSearchURLs OmniboxMarginSetForSearchURLs
+#endif
+IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
+ MAYBE_OmniboxMarginSetForSearchURLs) {
ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
FocusOmnibox();