diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 17:18:27 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 17:18:27 +0000 |
| commit | 91757b23b785589106b332ea9f9ad20084eabcda (patch) | |
| tree | d3b22ead62d7ae332251be157eedec0bdd58d75f | |
| parent | 56835ecb2b31d9976754d95a5ba7e101cc6fab3f (diff) | |
| download | chromium_src-91757b23b785589106b332ea9f9ad20084eabcda.zip chromium_src-91757b23b785589106b332ea9f9ad20084eabcda.tar.gz chromium_src-91757b23b785589106b332ea9f9ad20084eabcda.tar.bz2 | |
Disabling browser test that is crashing on the Mac bots.
BUG=29424
TEST=Disabling JavascriptAlertActivatesTab.
TBR=pamg
Review URL: http://codereview.chromium.org/866004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41282 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 960a4d7..f789b7d 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -183,7 +183,14 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, Title) { EXPECT_EQ(WideToUTF16(test_title), tab_title); } -IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) { +#if defined(OS_MACOSX) +// Test is crashing on Mac, see http://crbug.com/29424. +#define MAYBE_JavascriptAlertActivatesTab DISABLED_JavascriptAlertActivatesTab +#else +#define MAYBE_JavascriptAlertActivatesTab JavascriptAlertActivatesTab +#endif + +IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) { GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html")); ui_test_utils::NavigateToURL(browser(), url); browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, |