summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-11 19:16:16 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-11 19:16:16 +0000
commit6b2e4637452b4a3e5aeab4e881e83a9de0a7cc85 (patch)
tree6cb15b8ff12af0dc5453a2d33b28979fed507720 /tools
parent5eed5e670fb05e25ef727f82886ef090f475fc11 (diff)
downloadchromium_src-6b2e4637452b4a3e5aeab4e881e83a9de0a7cc85.zip
chromium_src-6b2e4637452b4a3e5aeab4e881e83a9de0a7cc85.tar.gz
chromium_src-6b2e4637452b4a3e5aeab4e881e83a9de0a7cc85.tar.bz2
Move timeout to right spot in tools/valgrind/chrome_tests.py. Fixes thinko committed in issue 114012.
Review URL: http://codereview.chromium.org/115191 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/valgrind/chrome_tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 24ec2f0..00dcbf1 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -240,10 +240,10 @@ class ChromeTests:
def TestUI(self):
return self.SimpleTest("chrome", "ui_tests",
valgrind_test_args=[
+ "--timeout=120000",
"--trace_children",
"--indirect"],
cmd_args=[
- "--timeout=120000",
"--ui-test-timeout=120000",
"--ui-test-action-timeout=80000",
"--ui-test-action-max-timeout=180000"])