Bug 908275 - Improve logging of xpcshell args in mochitests; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Fri, 23 Aug 2013 09:11:43 -0600
changeset 144084 c6a15f08e51eb97d3d70fd49f61ca592d4bd2ade
parent 144083 1c49896db3723e4aa170466fcef3ce68023a4375
child 144085 1916191a311c99a476a4695f136ecc2ac805c804
push id32856
push usergbrown@mozilla.com
push dateFri, 23 Aug 2013 15:12:02 +0000
treeherdermozilla-inbound@c6a15f08e51e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs908275
milestone26.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 908275 - Improve logging of xpcshell args in mochitests; r=jmaher
build/automation.py.in
testing/mochitest/runtests.py
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -213,17 +213,17 @@ class Automation(object):
                  close_fds=False,
                  shell=False,
                  cwd=None,
                  env=None,
                  universal_newlines=False,
                  startupinfo=None,
                  creationflags=0):
       args = automationutils.wrapCommand(args)
-      print "args: %s" % args
+      _log.info("INFO | automation.py | Launching: %s", subprocess.list2cmdline(args))
       subprocess.Popen.__init__(self, args, bufsize, executable,
                                 stdin, stdout, stderr,
                                 preexec_fn, close_fds,
                                 shell, cwd, env,
                                 universal_newlines, startupinfo, creationflags)
       self.log = _log
 
     def kill(self):
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -71,18 +71,17 @@ class MochitestServer:
     env["ASAN_OPTIONS"] = "quarantine_size=1:redzone=32"
 
     if mozinfo.isWin:
       env["PATH"] = env["PATH"] + ";" + str(self._xrePath)
 
     args = ["-g", self._xrePath,
             "-v", "170",
             "-f", self._httpdPath + "/httpd.js",
-            "-e", """const _PROFILE_PATH = '%(profile)s';const _SERVER_PORT = '%(port)s'; const _SERVER_ADDR = '%(server)s';
-                     const _TEST_PREFIX = %(testPrefix)s; const _DISPLAY_RESULTS = %(displayResults)s;""" %
+            "-e", """const _PROFILE_PATH = '%(profile)s'; const _SERVER_PORT = '%(port)s'; const _SERVER_ADDR = '%(server)s'; const _TEST_PREFIX = %(testPrefix)s; const _DISPLAY_RESULTS = %(displayResults)s;""" %
                    {"profile" : self._profileDir.replace('\\', '\\\\'), "port" : self.httpPort, "server" : self.webServer,
                     "testPrefix" : self.testPrefix, "displayResults" : str(not self._closeWhenDone).lower() },
             "-f", "./" + "server.js"]
 
     xpcshell = os.path.join(self._utilityPath,
                             "xpcshell" + mozinfo.info['bin_suffix'])
     self._process = self._automation.Process([xpcshell] + args, env = env)
     pid = self._process.pid