Bug 485531. Make --debugger-gdb work reliably on mac. r=ted

This commit is contained in:
Boris Zbarsky 2009-08-06 13:34:49 -04:00
parent fb6939649b
commit 035e5c7461

View File

@ -402,7 +402,7 @@ def fillCertificateDB(profileDir, certPath, utilityPath, xrePath):
os.unlink(pwfilePath) os.unlink(pwfilePath)
return 0 return 0
def environment(env = None, xrePath = DIST_BIN): def environment(env = None, xrePath = DIST_BIN, crashreporter = True):
if env == None: if env == None:
env = dict(os.environ) env = dict(os.environ)
@ -417,8 +417,9 @@ def environment(env = None, xrePath = DIST_BIN):
elif IS_WIN32: elif IS_WIN32:
env["PATH"] = env["PATH"] + ";" + ldLibraryPath env["PATH"] = env["PATH"] + ";" + ldLibraryPath
env['MOZ_CRASHREPORTER_NO_REPORT'] = '1' if crashreporter:
env['MOZ_CRASHREPORTER'] = '1' env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
env['MOZ_CRASHREPORTER'] = '1'
return env return env
@ -585,8 +586,11 @@ def runApp(testURL, env, app, profileDir, extraArgs,
else: else:
outputPipe = subprocess.PIPE outputPipe = subprocess.PIPE
proc = Process([cmd] + args, env = environment(env, xrePath = xrePath), proc = Process([cmd] + args,
stdout = outputPipe, stderr = subprocess.STDOUT) env = environment(env, xrePath = xrePath,
crashreporter = not debuggerInfo),
stdout = outputPipe,
stderr = subprocess.STDOUT)
log.info("INFO | automation.py | Application pid: %d", proc.pid) log.info("INFO | automation.py | Application pid: %d", proc.pid)
if outputPipe is None: if outputPipe is None: