diff options
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 8 | ||||
| -rw-r--r-- | chrome/renderer/extensions/extension_api_json_validity_unittest.cc | 1 |
2 files changed, 9 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))); diff --git a/chrome/renderer/extensions/extension_api_json_validity_unittest.cc b/chrome/renderer/extensions/extension_api_json_validity_unittest.cc index 5e55213..fa87afa 100644 --- a/chrome/renderer/extensions/extension_api_json_validity_unittest.cc +++ b/chrome/renderer/extensions/extension_api_json_validity_unittest.cc @@ -118,6 +118,7 @@ TEST_F(ExtensionApiJsonValidityTest, Basic) { << error_message; } +// Crashes on Vista, see http://crbug.com/43855 #if defined(OS_WIN) #define MAYBE_WithV8 DISABLED_WithV8 #else |