From 2c5fea22f8b6f6ed1b32c25270118f19116d04c4 Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Tue, 11 May 2010 13:51:02 +0000 Subject: Disable BrowserTest.ThirtyFourTabs on Mac. Also, add a comment to the previously disabled ExtensionApiJsonValidityTest.WithV8 test. TBR=phajdan.jr BUG=43862 TEST=Chromium Mac going green. Review URL: http://codereview.chromium.org/2057005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46912 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_browsertest.cc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'chrome/browser') diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 57631e1..214c8d6 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -224,6 +224,14 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) { // exact number of processes depends on the amount of memory. Previously we // had a hard limit of 31 processes and this test is mainly directed at // verifying that we don't crash when we pass this limit. + +// BrowserTest.ThirtyFourTabs times out on Mac, see http://crbug.com/43862 +#if defined OS(MAC) +#define MAYBE_ThirtyFourTabs DISABLED_ThirtyFourTabs +#else +#define MAYBE_ThirtyFourTabs ThirtyFourTabs +#endif + IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) { GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), FilePath(kTitle2File))); -- cgit v1.1