summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 19:12:56 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-08 19:12:56 +0000
commitade3ef65f389b00a101da5eb18a02b966d354b18 (patch)
treebaea1a01b7c03115e7cf90f9902d790887f43ec6 /tools
parent4d557acdad964ed36a8c92bf36ad6e0db9ccca3f (diff)
downloadchromium_src-ade3ef65f389b00a101da5eb18a02b966d354b18.zip
chromium_src-ade3ef65f389b00a101da5eb18a02b966d354b18.tar.gz
chromium_src-ade3ef65f389b00a101da5eb18a02b966d354b18.tar.bz2
Add automated_ui_tests and interactive_ui_tests to the Valgrind test runner
TEST=They work locally Review URL: http://codereview.chromium.org/5639007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/valgrind/chrome_tests.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index d43ec8b..c143bc6 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -280,6 +280,17 @@ class ChromeTests:
valgrind_test_args=self.UI_VALGRIND_ARGS,
cmd_args=self.UI_TEST_ARGS)
+ def TestAutomatedUI(self):
+ return self.SimpleTest("chrome", "automated_ui_tests",
+ valgrind_test_args=self.UI_VALGRIND_ARGS,
+ cmd_args=self.UI_TEST_ARGS)
+
+ 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=240000"]))
+
def TestReliability(self):
script_dir = path_utils.ScriptDir()
url_list_file = os.path.join(script_dir, "reliability", "url_list.txt")
@@ -395,11 +406,13 @@ class ChromeTests:
# The known list of tests.
# Recognise the original abbreviations as well as full executable names.
_test_list = {
+ "automated_ui" : TestAutomatedUI,
"base": TestBase, "base_unittests": TestBase,
"browser": TestBrowser, "browser_tests": TestBrowser,
"googleurl": TestGURL, "googleurl_unittests": TestGURL,
"courgette": TestCourgette, "courgette_unittests": TestCourgette,
"ipc": TestIpc, "ipc_tests": TestIpc,
+ "interactive_ui": TestInteractiveUI,
"layout": TestLayout, "layout_tests": TestLayout,
"media": TestMedia, "media_unittests": TestMedia,
"net": TestNet, "net_unittests": TestNet,