diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 18:52:59 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 18:52:59 +0000 |
| commit | c96068cc51b5c0cb1bdfdd952013aa240e8aab76 (patch) | |
| tree | ce360a5561674ebe45d76ba1855c33a0d058f13a /tools/valgrind/chrome_tests.py | |
| parent | fedb2bba7437c228282cce1bce4e88696eb1ea00 (diff) | |
| download | chromium_src-c96068cc51b5c0cb1bdfdd952013aa240e8aab76.zip chromium_src-c96068cc51b5c0cb1bdfdd952013aa240e8aab76.tar.gz chromium_src-c96068cc51b5c0cb1bdfdd952013aa240e8aab76.tar.bz2 | |
Reenable remoting_unittests under TSan.
Increase timeouts for remoting_unittests in valgrind. Reenable
remoting_unittests under TSan on Linux. The test is still disabled on
Windows.
BUG=57832
TEST=None
Review URL: http://codereview.chromium.org/4106004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.py')
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index 474ce5c..56159f2 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -235,7 +235,11 @@ class ChromeTests: return self.SimpleTest("chrome", "printing_unittests") def TestRemoting(self): - return self.SimpleTest("chrome", "remoting_unittests") + return self.SimpleTest("chrome", "remoting_unittests", + cmd_args=[ + "--ui-test-timeout=240000", + "--ui-test-action-timeout=120000", + "--ui-test-action-max-timeout=280000"]) def TestIpc(self): return self.SimpleTest("ipc", "ipc_tests", |