diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 20:20:13 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 20:20:13 +0000 |
| commit | 20133f0bcd5e73965f816d2b66fb8edbaf17a7f2 (patch) | |
| tree | 7d221ec0daf9602822a28d412fbe2d882940c83e /base | |
| parent | 2f2cef3c9ca1308f6011aece98ad7200d182c274 (diff) | |
| download | chromium_src-20133f0bcd5e73965f816d2b66fb8edbaf17a7f2.zip chromium_src-20133f0bcd5e73965f816d2b66fb8edbaf17a7f2.tar.gz chromium_src-20133f0bcd5e73965f816d2b66fb8edbaf17a7f2.tar.bz2 | |
Revert "Run tests faster."
After this change the test server flakily (?) failed to start for chrome_frame_tests.
TBR=agl
Review URL: http://codereview.chromium.org/3026042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_posix.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index 43de704..3455a43 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -148,8 +148,6 @@ bool KillProcess(ProcessHandle process_id, int exit_code, bool wait) { DCHECK_GT(process_id, 1) << " tried to kill invalid process_id"; if (process_id <= 1) return false; - static unsigned kMaxSleepMs = 1000; - unsigned sleep_ms = 4; bool result = kill(process_id, SIGTERM) == 0; @@ -173,9 +171,7 @@ bool KillProcess(ProcessHandle process_id, int exit_code, bool wait) { DPLOG(ERROR) << "Error waiting for process " << process_id; } - usleep(sleep_ms * 1000); - if (sleep_ms < kMaxSleepMs) - sleep_ms *= 2; + sleep(1); } if (!exited) |