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 /base/test | |
| 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 'base/test')
| -rw-r--r-- | base/test/test_switches.cc | 2 | ||||
| -rw-r--r-- | base/test/test_switches.h | 1 | ||||
| -rw-r--r-- | base/test/test_timeouts.cc | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/base/test/test_switches.cc b/base/test/test_switches.cc index d4491ee..7116108 100644 --- a/base/test/test_switches.cc +++ b/base/test/test_switches.cc @@ -10,6 +10,8 @@ const char switches::kLiveOperationTimeout[] = "live-operation-timeout"; // Time (in milliseconds) that the tests should wait before timing out. // TODO(phajdan.jr): Clean up the switch names. const char switches::kTestLargeTimeout[] = "test-large-timeout"; +// TODO(phajdan.jr): 'Fix callers and remove --test-terminate-timeout. +const char switches::kTestTerminateTimeout[] = "test-terminate-timeout"; const char switches::kTestTinyTimeout[] = "test-tiny-timeout"; const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout"; const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout"; diff --git a/base/test/test_switches.h b/base/test/test_switches.h index 81891cb6..5e4e8e2 100644 --- a/base/test/test_switches.h +++ b/base/test/test_switches.h @@ -11,6 +11,7 @@ namespace switches { // alongside the definition of their values in the .cc file. extern const char kLiveOperationTimeout[]; extern const char kTestLargeTimeout[]; +extern const char kTestTerminateTimeout[]; extern const char kTestTinyTimeout[]; extern const char kUiTestActionTimeout[]; extern const char kUiTestActionMaxTimeout[]; diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc index 6d7b96b..8de529d 100644 --- a/base/test/test_timeouts.cc +++ b/base/test/test_timeouts.cc @@ -66,6 +66,8 @@ void TestTimeouts::Initialize() { &action_timeout_ms_); InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_, &action_max_timeout_ms_); + // TODO(phajdan.jr): Fix callers and remove kTestTerminateTimeout. + InitializeTimeout(switches::kTestTerminateTimeout, &action_max_timeout_ms_); InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_, &large_test_timeout_ms_); InitializeTimeout(switches::kUiTestTimeout, large_test_timeout_ms_, |