Bug 1070042: Fix --debugger parameter in reftest/crashtest; r=ted
authorAaron Klotz <aklotz@mozilla.com>
Fri, 19 Sep 2014 14:49:34 -0600
changeset 206264 e8559c32028fd1aaf77236f8ce1e66d29509da6d
parent 206263 f592aa32b970167732254a0ecaf98228fad984a9
child 206265 f152a52a80e1ada09bbd8e877ab6b8c7f9be8b56
push id49389
push useraklotz@mozilla.com
push dateFri, 19 Sep 2014 20:50:20 +0000
treeherdermozilla-inbound@e8559c32028f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1070042
milestone35.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 1070042: Fix --debugger parameter in reftest/crashtest; r=ted
build/automation.py.in
layout/tools/reftest/mach_commands.py
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -750,19 +750,19 @@ class Automation(object):
     if self.IS_MAC and not self.IS_CAMINO and os.path.exists(cmd + "-bin"):
       # Prefer 'app-bin' in case 'app' is a shell script.
       # We can remove this hack once bug 673899 etc are fixed.
       cmd += "-bin"
 
     args = []
 
     if debuggerInfo:
-      args.extend(debuggerInfo["args"])
+      args.extend(debuggerInfo.args)
       args.append(cmd)
-      cmd = os.path.abspath(debuggerInfo["path"])
+      cmd = os.path.abspath(debuggerInfo.path)
 
     if self.IS_MAC:
       args.append("-foreground")
 
     if self.IS_CYGWIN:
       profileDirectory = commands.getoutput("cygpath -w \"" + profileDir + "/\"")
     else:
       profileDirectory = profileDir + "/"
@@ -845,17 +845,17 @@ class Automation(object):
       ssltunnelProcess = self.Process([ssltunnel, 
                                os.path.join(profileDir, "ssltunnel.cfg")], 
                                env = self.environment(xrePath = xrePath))
       self.log.info("INFO | automation.py | SSL tunnel pid: %d", ssltunnelProcess.pid)
 
     cmd, args = self.buildCommandLine(app, debuggerInfo, profileDir, testURL, extraArgs)
     startTime = datetime.now()
 
-    if debuggerInfo and debuggerInfo["interactive"]:
+    if debuggerInfo and debuggerInfo.interactive:
       # If an interactive debugger is attached, don't redirect output,
       # don't use timeouts, and don't capture ctrl-c.
       timeout = None
       maxTime = None
       outputPipe = None
       signal.signal(signal.SIGINT, lambda sigid, frame: None)
     else:
       outputPipe = subprocess.PIPE
--- a/layout/tools/reftest/mach_commands.py
+++ b/layout/tools/reftest/mach_commands.py
@@ -250,17 +250,17 @@ class ReftestRunner(MozbuildObject):
                 raise Exception('No manifest file was found at %s.' % path)
             env[b'TEST_PATH'] = path
         if filter:
             extra_args.extend(['--filter', self._make_shell_string(filter)])
 
         pass_thru = False
 
         if debugger:
-            extra_args.append('--debugger=%s' % debugger)
+            extra_args.append('--debugger=\'%s\'' % debugger)
             pass_thru = True
             if debugger_args:
                 # Use _make_shell_string (which quotes) so that we
                 # handle multiple args being passed to the debugger.
                 extra_args.extend(['--debugger-args', self._make_shell_string(debugger_args)])
         else:
             if debugger_args:
                 print("--debugger-args passed, but no debugger specified.")