diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 00:49:36 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 00:49:36 +0000 |
| commit | 3438fa8e09a8323ed1a6221a1344a51d23ff76e7 (patch) | |
| tree | ca1651a3b0e005867863e1115b39ec56d58f8377 /chrome/browser/chrome_browser_main_unittest.cc | |
| parent | 28da2a54d91f96c227efe0eb6c90ac57392194f5 (diff) | |
| download | chromium_src-3438fa8e09a8323ed1a6221a1344a51d23ff76e7.zip chromium_src-3438fa8e09a8323ed1a6221a1344a51d23ff76e7.tar.gz chromium_src-3438fa8e09a8323ed1a6221a1344a51d23ff76e7.tar.bz2 | |
[ChromiumOS] Disable tests which were crashing on the waterfall.
These have been crashing "Linux Clang (ChromeOS dbg)".
BUG=105326
Review URL: http://codereview.chromium.org/8677029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_unittest.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_unittest.cc | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/chrome/browser/chrome_browser_main_unittest.cc b/chrome/browser/chrome_browser_main_unittest.cc index f5c549b..3b3272a 100644 --- a/chrome/browser/chrome_browser_main_unittest.cc +++ b/chrome/browser/chrome_browser_main_unittest.cc @@ -25,7 +25,17 @@ class BrowserMainTest : public testing::Test { CommandLine command_line_; }; -TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) { +// http://crbug.com/105326 +// Crashes unit_tests on "Linux Clang (ChromeOS dbg)". +#if defined(OS_CHROMEOS) +#define MAYBE_WarmConnectionFieldTrial_WarmestSocket \ + DISABLED_WarmConnectionFieldTrial_WarmestSocket +#else +#define MAYBE_WarmConnectionFieldTrial_WarmestSocket \ + WarmConnectionFieldTrial_WarmestSocket +#endif + +TEST_F(BrowserMainTest, MAYBE_WarmConnectionFieldTrial_WarmestSocket) { command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "0"); scoped_ptr<content::MainFunctionParams> params( @@ -40,7 +50,17 @@ TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) { } } -TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) { +// http://crbug.com/105326 +// Crashes unit_tests on "Linux Clang (ChromeOS dbg)". +#if defined(OS_CHROMEOS) +#define MAYBE_WarmConnectionFieldTrial_Random \ + DISABLED_WarmConnectionFieldTrial_Random +#else +#define MAYBE_WarmConnectionFieldTrial_Random \ + WarmConnectionFieldTrial_Random +#endif + +TEST_F(BrowserMainTest, MAYBE_WarmConnectionFieldTrial_Random) { scoped_ptr<content::MainFunctionParams> params( new content::MainFunctionParams(command_line_)); scoped_ptr<content::BrowserMainParts> bw( @@ -58,7 +78,17 @@ TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) { } } -TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) { +// http://crbug.com/105326 +// Crashes unit_tests on "Linux Clang (ChromeOS dbg)". +#if defined(OS_CHROMEOS) +#define MAYBE_WarmConnectionFieldTrial_Invalid \ + DISABLED_WarmConnectionFieldTrial_Invalid +#else +#define MAYBE_WarmConnectionFieldTrial_Invalid \ + WarmConnectionFieldTrial_Invalid +#endif + +TEST_F(BrowserMainTest, MAYBE_WarmConnectionFieldTrial_Invalid) { command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100"); scoped_ptr<content::MainFunctionParams> params( |