diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 17:22:23 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 17:22:23 +0000 |
| commit | 4a890c1498bb021fb922f407299602df49ac2b87 (patch) | |
| tree | 722c3a900a3df3a23c763064a83f3df4c9411fe2 /webkit/tools/test_shell/test_shell_mac.mm | |
| parent | f87251a8f81886f3cf5b3f378b57e04b61c228b8 (diff) | |
| download | chromium_src-4a890c1498bb021fb922f407299602df49ac2b87.zip chromium_src-4a890c1498bb021fb922f407299602df49ac2b87.tar.gz chromium_src-4a890c1498bb021fb922f407299602df49ac2b87.tar.bz2 | |
Removed the doubling of the timeout value, the build bots seem to be doing
better, and if it's still a problem, we'll update bot scripts to deal w/
it so we don't force the longer delays on all developers.
Review URL: http://codereview.chromium.org/18503
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_mac.mm')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_mac.mm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 6dfcdd5..99846a5 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -612,10 +612,9 @@ void TestShell::WaitTestFinished() { // timeout, it can't do anything except terminate the test // shell, which is unfortunate. // Windows multiplies by 2.5, but that causes us to run for far, far too - // long. We can adjust it down later if we need to. (The Mac BuildBots have - // some IO problems that slow things down, so we're leaving this high just - // to give the server a little more breathing room.) - NSTimeInterval timeout_seconds = GetLayoutTestTimeoutInSeconds() * 2.0; + // long. We use the passed value and let the scripts flag override + // the value as needed. + NSTimeInterval timeout_seconds = GetLayoutTestTimeoutInSeconds(); WatchDogTarget* watchdog = [[[WatchDogTarget alloc] initWithTimeout:timeout_seconds] autorelease]; NSThread* thread = [[NSThread alloc] initWithTarget:watchdog |