Bug 1246719 - mach mochitest --valgrind: use comma as separator for --valgrind-args. r=james@hoppipolla.co.uk.
authorJulian Seward <jseward@acm.org>
Tue, 09 Feb 2016 14:38:55 +0100
changeset 321858 2a70aa2e1d133fe6b2ac7a580109f2218214d4ad
parent 321857 45c16dd1f3bde7d39d0ccecd75920ce24376e1a7
child 321859 e06a6a44eeeca3f9883dc7a8cd9b79ec41903d4f
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjames
bugs1246719
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1246719 - mach mochitest --valgrind: use comma as separator for --valgrind-args. r=james@hoppipolla.co.uk.
testing/mochitest/mochitest_options.py
testing/mochitest/runtests.py
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -525,17 +525,17 @@ class MochitestArguments(ArgumentContain
           }],
         [["--valgrind"],
          {"default": None,
           "help": "Valgrind binary to run tests with. Program name or path.",
           }],
         [["--valgrind-args"],
          {"dest": "valgrindArgs",
           "default": None,
-          "help": "Extra arguments to pass to Valgrind.",
+          "help": "Comma-separated list of extra arguments to pass to Valgrind.",
           }],
         [["--valgrind-supp-files"],
          {"dest": "valgrindSuppFiles",
           "default": None,
           "help": "Comma-separated list of suppression files to pass to Valgrind.",
           }],
         [["--debugger-interactive"],
          {"action": "store_true",
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1883,17 +1883,17 @@ class MochitestDesktop(MochitestBase):
         if debuggerInfo:
             interactive = debuggerInfo.interactive
             debug_args = [debuggerInfo.path] + debuggerInfo.args
 
         # Set up Valgrind arguments.
         if valgrindPath:
             interactive = False
             valgrindArgs_split = ([] if valgrindArgs is None
-                                  else valgrindArgs.split())
+                                  else valgrindArgs.split(","))
 
             valgrindSuppFiles_final = []
             if valgrindSuppFiles is not None:
                 valgrindSuppFiles_final = ["--suppressions=" + path for path in valgrindSuppFiles.split(",")]
 
             debug_args = ([valgrindPath]
                           + mozdebug.get_default_valgrind_args()
                           + valgrindArgs_split