summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 17:34:05 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 17:34:05 +0000
commit482853dcc4fd22bb0b27e75a9b0f9b350c58d731 (patch)
tree747ba485d1b5d6a25ca784cac5032945352864c2 /tools
parentaa25397e8f980bdc5ad8f161b4129d741aa13397 (diff)
downloadchromium_src-482853dcc4fd22bb0b27e75a9b0f9b350c58d731.zip
chromium_src-482853dcc4fd22bb0b27e75a9b0f9b350c58d731.tar.gz
chromium_src-482853dcc4fd22bb0b27e75a9b0f9b350c58d731.tar.bz2
Remove unused test command-line switches.
BUG=none Review URL: http://codereview.chromium.org/7743006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/valgrind/chrome_tests.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 8cf5246a..12ec2ef 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -290,8 +290,7 @@ class ChromeTests:
def TestInteractiveUI(self):
return self.SimpleTest("chrome", "interactive_ui_tests",
valgrind_test_args=self.UI_VALGRIND_ARGS,
- cmd_args=(self.UI_TEST_ARGS +
- ["--test-terminate-timeout=300000"]))
+ cmd_args=self.UI_TEST_ARGS)
def TestReliability(self):
script_dir = path_utils.ScriptDir()
@@ -304,12 +303,12 @@ class ChromeTests:
def TestSafeBrowsing(self):
return self.SimpleTest("chrome", "safe_browsing_tests",
valgrind_test_args=self.UI_VALGRIND_ARGS,
- cmd_args=(["--test-terminate-timeout=900000"]))
+ cmd_args=(["--ui-test-action-max-timeout=900000"]))
def TestSyncIntegration(self):
return self.SimpleTest("chrome", "sync_integration_tests",
valgrind_test_args=self.UI_VALGRIND_ARGS,
- cmd_args=(["--test-terminate-timeout=900000"]))
+ cmd_args=(["--ui-test-action-max-timeout=900000"]))
def TestUI(self):
return self.SimpleTest("chrome", "ui_tests",