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

Unified Diff: base/test/test_timeouts.h

Issue 476543004: Implement unit test specific test launcher timeout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « base/test/test_switches.cc ('k') | base/test/test_timeouts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_timeouts.h
diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h
index f08c697675b742f3547626ba8d6b0fa4a83f4ff4..df579182d885f7c8ab64ed0255de5ea2aee70d88 100644
--- a/base/test/test_timeouts.h
+++ b/base/test/test_timeouts.h
@@ -44,6 +44,13 @@ class TestTimeouts {
return base::TimeDelta::FromMilliseconds(large_test_timeout_ms_);
}
+ // Timeout for a single unit test launched used built-in test launcher.
jam 2014/08/19 19:56:42 s/used/using
+ // Do not use outside of the test launcher.
+ static base::TimeDelta test_launcher_unit_timeout() {
+ DCHECK(initialized_);
+ return base::TimeDelta::FromMilliseconds(test_launcher_unit_timeout_ms_);
+ }
+
// Timeout for a single test launched used built-in test launcher.
// Do not use outside of the test launcher.
static base::TimeDelta test_launcher_timeout() {
@@ -58,6 +65,7 @@ class TestTimeouts {
static int action_timeout_ms_;
static int action_max_timeout_ms_;
static int large_test_timeout_ms_;
+ static int test_launcher_unit_timeout_ms_;
static int test_launcher_timeout_ms_;
DISALLOW_IMPLICIT_CONSTRUCTORS(TestTimeouts);
« no previous file with comments | « base/test/test_switches.cc ('k') | base/test/test_timeouts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698