diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 00:13:58 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 00:13:58 +0000 |
| commit | df38ae8ba3f060b64260881015dc4d671f2bf131 (patch) | |
| tree | 28abea5babf12fbb62f57a94f3eefa256cabdac8 | |
| parent | 62619727e730defa12b46361eb288c127221e787 (diff) | |
| download | chromium_src-df38ae8ba3f060b64260881015dc4d671f2bf131.zip chromium_src-df38ae8ba3f060b64260881015dc4d671f2bf131.tar.gz chromium_src-df38ae8ba3f060b64260881015dc4d671f2bf131.tar.bz2 | |
Disable ContentSettingBubbleControllerTest.Init under ASan on Mac.
BUG=134060
TBR=cevans
Review URL: https://chromiumcodereview.appspot.com/10633020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143494 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm index 09bbc597..8131bde 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -54,8 +54,15 @@ ContentSettingBubbleControllerTest::ContentSettingBubbleControllerTest() ContentSettingBubbleControllerTest::~ContentSettingBubbleControllerTest() { } +// Fails under ASan, http://crbug.com/134060. +#if defined(ADDRESS_SANITIZER) +#define MAYBE_Init DISABLED_Init +#else +#define MAYBE_Init Init +#endif + // Check that the bubble doesn't crash or leak for any settings type -TEST_F(ContentSettingBubbleControllerTest, Init) { +TEST_F(ContentSettingBubbleControllerTest, MAYBE_Init) { for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { if (i == CONTENT_SETTINGS_TYPE_NOTIFICATIONS || i == CONTENT_SETTINGS_TYPE_INTENTS || |