diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 23:19:16 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 23:19:16 +0000 |
| commit | 79bf2f08d78a22899e7ad37e2ee1c8235b076500 (patch) | |
| tree | 60672dba5ed0e6cc677f828431d41a3581e268ea /tools/valgrind/chrome_tests.py | |
| parent | ad50def5e1165d0cc74b98f988bbd5962587d9f4 (diff) | |
| download | chromium_src-79bf2f08d78a22899e7ad37e2ee1c8235b076500.zip chromium_src-79bf2f08d78a22899e7ad37e2ee1c8235b076500.tar.gz chromium_src-79bf2f08d78a22899e7ad37e2ee1c8235b076500.tar.bz2 | |
Make timeouts smaller under Valgrind.
BUG=none
TEST=none
TBR=timurrrr
Review URL: http://codereview.chromium.org/8353014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.py')
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index 7a620a9..600f93c 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -254,8 +254,8 @@ class ChromeTests: def TestRemoting(self): return self.SimpleTest("chrome", "remoting_unittests", cmd_args=[ - "--ui-test-action-timeout=80000", - "--ui-test-action-max-timeout=200000"]) + "--ui-test-action-timeout=60000", + "--ui-test-action-max-timeout=150000"]) def TestSql(self): return self.SimpleTest("chrome", "sql_unittests") @@ -278,8 +278,8 @@ class ChromeTests: # Valgrind timeouts are in seconds. UI_VALGRIND_ARGS = ["--timeout=14400", "--trace_children", "--indirect"] # UI test timeouts are in milliseconds. - UI_TEST_ARGS = ["--ui-test-action-timeout=80000", - "--ui-test-action-max-timeout=200000"] + UI_TEST_ARGS = ["--ui-test-action-timeout=60000", + "--ui-test-action-max-timeout=150000"] def TestAutomatedUI(self): return self.SimpleTest("chrome", "automated_ui_tests", @@ -307,12 +307,12 @@ class ChromeTests: def TestSafeBrowsing(self): return self.SimpleTest("chrome", "safe_browsing_tests", valgrind_test_args=self.UI_VALGRIND_ARGS, - cmd_args=(["--ui-test-action-max-timeout=600000"])) + cmd_args=(["--ui-test-action-max-timeout=450000"])) def TestSyncIntegration(self): return self.SimpleTest("chrome", "sync_integration_tests", valgrind_test_args=self.UI_VALGRIND_ARGS, - cmd_args=(["--ui-test-action-max-timeout=600000"])) + cmd_args=(["--ui-test-action-max-timeout=450000"])) def TestUI(self): return self.SimpleTest("chrome", "ui_tests", |