Minor changes to valgrind test scripts to add running on additional unit

tests.

LGTM-ed here: http://codereview.chromium.org/27306/show
(I didn't have my @chromium.org account then)



git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10936 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 21 insertions, 4 deletions

diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index b261c0e..538a48f 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -48,14 +48,17 @@ class ChromeTests:
   def __init__(self, options, args, test):
     # the known list of tests
     self._test_list = {
-#      "test_shell": self.TestTestShell,
+      "test_shell": self.TestTestShell,
       "unit": self.TestUnit,
       "net": self.TestNet,
       "ipc": self.TestIpc,
       "base": self.TestBase,
+      "googleurl": self.TestGoogleurl,
+      "media": self.TestMedia,
+      "printing": self.TestPrinting,
 #      "layout": self.TestLayout,
 #      "layout_all": self.TestLayoutAll,
-#      "ui": self.TestUI
+      "ui": self.TestUI
     }
 
     if test not in self._test_list:
@@ -215,6 +218,15 @@ class ChromeTests:
   def TestBase(self):
     return self.SimpleTest("base", "base_unittests")
 
+  def TestGoogleurl(self):
+    return self.SimpleTest("chrome", "googleurl_unittests")
+
+  def TestMedia(self):
+    return self.SimpleTest("chrome", "media_unittests")
+
+  def TestPrinting(self):
+    return self.SimpleTest("chrome", "printing_unittests")
+
   def TestIpc(self):
     return self.SimpleTest("chrome", "ipc_tests")
 
@@ -227,6 +239,9 @@ class ChromeTests:
   def TestUnit(self):
     return self.SimpleTest("chrome", "unit_tests")
 
+  def TestUI(self):
+    return self.SimpleTest("chrome", "ui_tests")
+
 #   def TestLayoutAll(self):
 #     return self.TestLayout(run_all=True)
 
@@ -314,7 +329,7 @@ class ChromeTests:
 #                              multi=True)
 
 
-def _main(argv):
+def _main(_):
   parser = optparse.OptionParser("usage: %prog -b <dir> -t <test> "
                                  "[-t <test> ...]")
   parser.disable_interspersed_args()
diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py
index 9075a0e..020cacb 100755
--- a/tools/valgrind/valgrind_test.py
+++ b/tools/valgrind/valgrind_test.py
@@ -182,7 +182,9 @@ class ValgrindMac(Valgrind):
   def ValgrindCommand(self):
     """Get the valgrind command to run."""
     proc = ["valgrind", "--leak-check=full"]
-    proc += ["--log-file=" + self.TMP_DIR + "/valgrind.%p"] + self._args
+    # TODO(nirnimesh): Enable --log-file when Analyze() is implemented
+    #proc += ["--log-file=" + self.TMP_DIR + "/valgrind.%p"]
+    proc += self._args
     return proc
 
   def Analyze(self):