summaryrefslogtreecommitdiffstats
path: root/tools/valgrind
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 19:41:01 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 19:41:01 +0000
commit6939017b8df7e39d829855bda4538fcf75ca3a97 (patch)
tree9d7e660dcd50ab66707a49f35b743737f484bd69 /tools/valgrind
parentc3bd85ad36f08eaaa9a2fddde08aa0204a0a7964 (diff)
downloadchromium_src-6939017b8df7e39d829855bda4538fcf75ca3a97.zip
chromium_src-6939017b8df7e39d829855bda4538fcf75ca3a97.tar.gz
chromium_src-6939017b8df7e39d829855bda4538fcf75ca3a97.tar.bz2
Get rid of unused flags.
These ui test flags no longer exist. Removing them should be a no-op. BUG=none TEST=none Review URL: http://codereview.chromium.org/6880048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind')
-rwxr-xr-xtools/valgrind/chrome_tests.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 821502c..fb45f55 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -234,7 +234,6 @@ class ChromeTests:
def TestRemoting(self):
return self.SimpleTest("chrome", "remoting_unittests",
cmd_args=[
- "--ui-test-timeout=240000",
"--ui-test-action-timeout=120000",
"--ui-test-action-max-timeout=280000"])
@@ -273,10 +272,8 @@ class ChromeTests:
# 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_ARGS = ["--ui-test-action-timeout=120000",
"--ui-test-action-max-timeout=280000",
- "--ui-test-sleep-timeout=120000",
"--ui-test-terminate-timeout=120000"]
def TestUI(self):
return self.SimpleTest("chrome", "ui_tests",