summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 01:33:51 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 01:33:51 +0000
commit0ee7ff1fc752b0e7d4b10447bb994bb5e7575571 (patch)
tree8fcca5485871266565b8b80fa2c856c5339c1e0b
parent33241d60fc280999a390506a174d8653cb39bad7 (diff)
downloadchromium_src-0ee7ff1fc752b0e7d4b10447bb994bb5e7575571.zip
chromium_src-0ee7ff1fc752b0e7d4b10447bb994bb5e7575571.tar.gz
chromium_src-0ee7ff1fc752b0e7d4b10447bb994bb5e7575571.tar.bz2
Check result of InProcessBrowserTest.Empty
Currently that's the only test in content_browsertests, so it's even more important to make sure it passes. BUG=none Review URL: http://codereview.chromium.org/8179002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104420 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/test/test_launcher.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/content/test/test_launcher.cc b/content/test/test_launcher.cc
index d2492c3..729384b 100644
--- a/content/test/test_launcher.cc
+++ b/content/test/test_launcher.cc
@@ -610,9 +610,11 @@ int LaunchTests(TestLauncherDelegate* launcher_delegate,
// from disk may be slow on a busy bot, and can easily exceed the default
// timeout causing flaky test failures. Use an empty test that only starts
// and closes a browser with a long timeout to avoid those problems.
- RunTest(launcher_delegate,
- kEmptyTestName,
- TestTimeouts::large_test_timeout_ms());
+ int exit_code = RunTest(launcher_delegate,
+ kEmptyTestName,
+ TestTimeouts::large_test_timeout_ms());
+ if (exit_code != 0)
+ return exit_code;
int cycles = 1;
if (command_line->HasSwitch(kGTestRepeatFlag)) {
@@ -620,7 +622,6 @@ int LaunchTests(TestLauncherDelegate* launcher_delegate,
&cycles);
}
- int exit_code = 0;
while (cycles != 0) {
if (!RunTests(launcher_delegate,
should_shard,