summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-20 21:04:04 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-20 21:04:04 +0000
commit0fad1cda301b8cb6f1c0f280df1d1deb381dfdb3 (patch)
treed722b153ae5d4cb445a7772608be5ceefc4255f4 /content/test
parent621d7c26668cbb7db851ed1f46f80ffec480eaaa (diff)
downloadchromium_src-0fad1cda301b8cb6f1c0f280df1d1deb381dfdb3.zip
chromium_src-0fad1cda301b8cb6f1c0f280df1d1deb381dfdb3.tar.gz
chromium_src-0fad1cda301b8cb6f1c0f280df1d1deb381dfdb3.tar.bz2
Ensure Timed out Tests Aren't Ignored
BUG=128978 TEST= Review URL: https://chromiumcodereview.appspot.com/10559069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/test_launcher.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/test/test_launcher.cc b/content/test/test_launcher.cc
index a59220b..de0e1b0 100644
--- a/content/test/test_launcher.cc
+++ b/content/test/test_launcher.cc
@@ -497,9 +497,9 @@ bool RunTests(TestLauncherDelegate* launcher_delegate,
bool ignore_failure = false;
- // -1 exit code means a crash or hang. Never ignore those failures,
- // they are serious and should always be visible.
- if (exit_code != -1)
+ // Never ignore crashes or hangs/timeouts, they are serious and should
+ // always be visible.
+ if (exit_code != -1 && !was_timeout)
ignore_failure = base::TestSuite::ShouldIgnoreFailure(*test_info);
printer.OnTestEnd(test_info->name(), test_case->name(), true, true,