diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 20:37:03 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 20:37:03 +0000 |
| commit | 558bf52e55fa74735bb9efc851515de2994ca828 (patch) | |
| tree | 2894fe61558c7d8d0abb27d86db131d497837c05 | |
| parent | 8eb26a975613aab90f2eed7730d341fa6f6fe588 (diff) | |
| download | chromium_src-558bf52e55fa74735bb9efc851515de2994ca828.zip chromium_src-558bf52e55fa74735bb9efc851515de2994ca828.tar.gz chromium_src-558bf52e55fa74735bb9efc851515de2994ca828.tar.bz2 | |
Valgrind timeouts are in seconds. Let's set some saner values.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3796006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75628 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index 7be9dc3..2588a39 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -262,7 +262,9 @@ class ChromeTests: def TestGfx(self): return self.SimpleTest("chrome", "gfx_unittests") - UI_VALGRIND_ARGS = ["--timeout=180000", "--trace_children", "--indirect"] + # Valgrind timeouts are in seconds. + UI_VALGRIND_ARGS = ["--timeout=7200", "--trace_children", "--indirect"] + # UI test timeouts are in milliseconds. UI_TEST_ARGS = ["--ui-test-timeout=240000", "--ui-test-action-timeout=120000", "--ui-test-action-max-timeout=280000", |