summaryrefslogtreecommitdiffstats
path: root/tools/valgrind/chrome_tests.py
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 22:52:55 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 22:52:55 +0000
commit09bda1d4c44932eefc99c5fb60290f1c2b335a40 (patch)
treeb266b1bce8258e728b1292ca2e0bdbd215b87f6a /tools/valgrind/chrome_tests.py
parent65e8b2e40b2ecfb82f9eec123a8b749fcca44622 (diff)
downloadchromium_src-09bda1d4c44932eefc99c5fb60290f1c2b335a40.zip
chromium_src-09bda1d4c44932eefc99c5fb60290f1c2b335a40.tar.gz
chromium_src-09bda1d4c44932eefc99c5fb60290f1c2b335a40.tar.bz2
Add sync_integration_tests support to valgrind's chrome_tests.sh.
BUG=73198 TEST=self Review URL: http://codereview.chromium.org/6534004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.py')
-rwxr-xr-xtools/valgrind/chrome_tests.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index bd59339..a286365 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -307,6 +307,11 @@ class ChromeTests:
def TestSync(self):
return self.SimpleTest("chrome", "sync_unit_tests")
+ def TestSyncIntegration(self):
+ return self.SimpleTest("chrome", "sync_integration_tests",
+ valgrind_test_args=self.UI_VALGRIND_ARGS,
+ cmd_args=(["--test-terminate-timeout=900000"]))
+
def TestLayoutChunk(self, chunk_num, chunk_size):
# Run tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size) from the
# list of tests. Wrap around to beginning of list at end.
@@ -428,6 +433,8 @@ class ChromeTests:
"safe_browsing": TestSafeBrowsing, "safe_browsing_tests": TestSafeBrowsing,
"startup": TestStartup, "startup_tests": TestStartup,
"sync": TestSync, "sync_unit_tests": TestSync,
+ "sync_integration_tests": TestSyncIntegration,
+ "sync_integration": TestSyncIntegration,
"test_shell": TestTestShell, "test_shell_tests": TestTestShell,
"ui": TestUI, "ui_tests": TestUI,
"unit": TestUnit, "unit_tests": TestUnit,