diff options
| author | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 00:52:01 +0000 |
|---|---|---|
| committer | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 00:52:01 +0000 |
| commit | dac3823fca2dd4d2b0aa2184ef918d27cfb536e6 (patch) | |
| tree | f6adff323691996594a575e30c6844993dd91eab /webkit/tools/test_shell/test_shell_win.cc | |
| parent | 67160788a18897b755b17238c53566a16f703669 (diff) | |
| download | chromium_src-dac3823fca2dd4d2b0aa2184ef918d27cfb536e6.zip chromium_src-dac3823fca2dd4d2b0aa2184ef918d27cfb536e6.tar.gz chromium_src-dac3823fca2dd4d2b0aa2184ef918d27cfb536e6.tar.bz2 | |
Reduce the testshell watchdog timeout to just be the timeout
instead of 2.5 * timeout. This matches Mac/Linux testshells and
will make the tests run faster as we have some timing out
tests actually getting killed by the watchdog, e.g.,
LayoutTests/http/tests/misc/dns-prefetch-control.html.
Not sure why this was ever 2.5x in the first place. This is
old code that was pulled in from before open sourcing.
Review URL: http://codereview.chromium.org/267131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_win.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 7d2cf88..f2e518a 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -399,7 +399,7 @@ unsigned int __stdcall WatchDogThread(void *arg) { return 0; TestShell* shell = static_cast<TestShell*>(arg); - DWORD timeout = static_cast<DWORD>(shell->GetLayoutTestTimeout() * 2.5); + DWORD timeout = static_cast<DWORD>(shell->GetLayoutTestTimeoutForWatchDog()); DWORD rv = WaitForSingleObject(shell->finished_event(), timeout); if (rv == WAIT_TIMEOUT) { // Print a warning to be caught by the layout-test script. |