diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 23:39:17 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 23:39:17 +0000 |
| commit | c169dc0d94711c62c8958af6697bff66170b7dec (patch) | |
| tree | 5a0293d0c3ed94adbaa0e5d33348c9def66c00b7 /chrome/browser | |
| parent | 86e256745ebaa728aabd275f89e3339f83acc106 (diff) | |
| download | chromium_src-c169dc0d94711c62c8958af6697bff66170b7dec.zip chromium_src-c169dc0d94711c62c8958af6697bff66170b7dec.tar.gz chromium_src-c169dc0d94711c62c8958af6697bff66170b7dec.tar.bz2 | |
Disables recently added instant test as it seems to be causing crashes
(unrelated to my change) on the bots.
BUG=76283
TEST=none
TBR=tonyg@chromium.org
Review URL: http://codereview.chromium.org/6697040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/instant/instant_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc index 26d4006..f57a214 100644 --- a/chrome/browser/instant/instant_browsertest.cc +++ b/chrome/browser/instant/instant_browsertest.cc @@ -728,7 +728,13 @@ IN_PROC_BROWSER_TEST_F(InstantTest, InstantCompleteDelayed) { } // Make sure the renderer doesn't crash if javascript is blocked. -IN_PROC_BROWSER_TEST_F(InstantTest, DontCrashOnBlockedJS) { +// Disabled on max/linuc, see 76283. +#if defined(OS_MACOSX) || defined(OS_LINUX) +#define MAYBE_DontCrashOnBlockedJS DISABLED_DontCrashOnBlockedJS +#else +#define MAYBE_DontCrashOnBlockedJS DontCrashOnBlockedJS +#endif +IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_DontCrashOnBlockedJS) { browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK); ASSERT_TRUE(test_server()->Start()); |