diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 20:49:40 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 20:49:40 +0000 |
| commit | 04b74d13d927794495a1a3a1b89d67f85a104e12 (patch) | |
| tree | b9a5dc732659cada99a8e2d7f652749dbc583e6b /tools/valgrind/chrome_tests.py | |
| parent | 34da373d3e61abac19c011d4526fb9b7041cfca1 (diff) | |
| download | chromium_src-04b74d13d927794495a1a3a1b89d67f85a104e12.zip chromium_src-04b74d13d927794495a1a3a1b89d67f85a104e12.tar.gz chromium_src-04b74d13d927794495a1a3a1b89d67f85a104e12.tar.bz2 | |
Add a switch to allow longer shutdown timeouts, since quitting under valgrind is very slow on the Mac.
BUG=none
TEST=Most/all of the UI tests should pass on the Mac when run under valgrind.
Review URL: http://codereview.chromium.org/140008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.py')
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index ec2ad74..96e5bc0 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -247,7 +247,8 @@ class ChromeTests: cmd_args=[ "--ui-test-timeout=120000", "--ui-test-action-timeout=80000", - "--ui-test-action-max-timeout=180000"]) + "--ui-test-action-max-timeout=180000", + "--ui-test-terminate-timeout=60000"]) def TestLayoutChunk(self, chunk_num, chunk_size): # Run tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size) from the |