diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 13:51:02 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 13:51:02 +0000 |
| commit | 2c5fea22f8b6f6ed1b32c25270118f19116d04c4 (patch) | |
| tree | 2af4ce4e707b484370d0abc96ce2293183e947fd /chrome/browser | |
| parent | 777a7b66c0a16a8917b29af3ea6d2e440bc5371b (diff) | |
| download | chromium_src-2c5fea22f8b6f6ed1b32c25270118f19116d04c4.zip chromium_src-2c5fea22f8b6f6ed1b32c25270118f19116d04c4.tar.gz chromium_src-2c5fea22f8b6f6ed1b32c25270118f19116d04c4.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
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))); |