Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3828)

Unified Diff: base/test/launcher/unit_test_launcher.cc

Issue 476543004: Implement unit test specific test launcher timeout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: after disabling Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/test/test_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/launcher/unit_test_launcher.cc
diff --git a/base/test/launcher/unit_test_launcher.cc b/base/test/launcher/unit_test_launcher.cc
index 0cbae2fac366d232ef9f7eb75a1f85eb32cef282..57552e010f02fb1f188872dfef3da2d6a82434db 100644
--- a/base/test/launcher/unit_test_launcher.cc
+++ b/base/test/launcher/unit_test_launcher.cc
@@ -186,7 +186,7 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate {
test_launcher->LaunchChildGTestProcess(
cmd_line,
std::string(),
- TestTimeouts::test_launcher_timeout(),
+ TestTimeouts::test_launcher_unit_timeout(),
use_job_objects_ ? TestLauncher::USE_JOB_OBJECTS : 0,
Bind(&UnitTestLauncherDelegate::SerialGTestCallback,
Unretained(this),
@@ -218,7 +218,7 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate {
// Note: do NOT parse child's stdout to do that, it's known to be
// unreliable (e.g. buffering issues can mix up the output).
base::TimeDelta timeout =
- test_names.size() * TestTimeouts::test_launcher_timeout();
+ test_names.size() * TestTimeouts::test_launcher_unit_timeout();
GTestCallbackState callback_state;
callback_state.test_launcher = test_launcher;
@@ -345,7 +345,7 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate {
// For consistent handling of tests independent of order and other
// factors, mark them as timing out.
if (test_result.elapsed_time >
- TestTimeouts::test_launcher_timeout()) {
+ TestTimeouts::test_launcher_unit_timeout()) {
test_result.status = TestResult::TEST_TIMEOUT;
}
}
« no previous file with comments | « no previous file | base/test/test_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698