diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 08:46:27 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 08:46:27 +0000 |
| commit | bfbe677d31356d7b21a8f02f8f4ca50e2119a214 (patch) | |
| tree | 41da85f1046c5058256ece6d1aa16d981543d195 /chrome/test/test_launcher_utils.cc | |
| parent | b798b242520fd47bc7fe73c53c0d7105b136a371 (diff) | |
| download | chromium_src-bfbe677d31356d7b21a8f02f8f4ca50e2119a214.zip chromium_src-bfbe677d31356d7b21a8f02f8f4ca50e2119a214.tar.gz chromium_src-bfbe677d31356d7b21a8f02f8f4ca50e2119a214.tar.bz2 | |
GTTF: Move --test-terminate-timeout logic to base/test/test_timeouts
This is the first step towards removing --test-terminate-timeout completely.
In this CL --test-terminate-timeout becomes a synonym for
--ui-test-action-max-timeout.
This makes it possible to switch callers to --ui-test-action-max-timeout
and remove --test-terminate-timeout.
Removing number of different kinds of timeouts makes it easier to pick one.
BUG=none
Review URL: http://codereview.chromium.org/7111035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/test_launcher_utils.cc')
| -rw-r--r-- | chrome/test/test_launcher_utils.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/chrome/test/test_launcher_utils.cc b/chrome/test/test_launcher_utils.cc index 759267f..b9e6541 100644 --- a/chrome/test/test_launcher_utils.cc +++ b/chrome/test/test_launcher_utils.cc @@ -15,10 +15,6 @@ namespace { -// TODO(phajdan.jr): remove this flag and fix its users. -// We should use base/test/test_timeouts and not custom flags. -static const char kTestTerminateTimeoutFlag[] = "test-terminate-timeout"; - // A multiplier for slow tests. We generally avoid multiplying // test timeouts by any constants. Here it is used as last resort // to implement the SLOW_ test prefix. @@ -94,18 +90,6 @@ bool OverrideGLImplementation(CommandLine* command_line, int GetTestTerminationTimeout(const std::string& test_name, int default_timeout_ms) { int timeout_ms = default_timeout_ms; - if (CommandLine::ForCurrentProcess()->HasSwitch(kTestTerminateTimeoutFlag)) { - std::string timeout_str = - CommandLine::ForCurrentProcess()->GetSwitchValueASCII( - kTestTerminateTimeoutFlag); - int timeout; - if (base::StringToInt(timeout_str, &timeout)) { - timeout_ms = std::max(timeout_ms, timeout); - } else { - LOG(ERROR) << "Invalid timeout (" << kTestTerminateTimeoutFlag << "): " - << timeout_str; - } - } // Make it possible for selected tests to request a longer timeout. // Generally tests should really avoid doing too much, and splitting |