Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1283911 - fix alternate binary searching in autospider.py, r=sandervv

Browse Source 
--HG--
extra : rebase_source : 3eec9d09ae70f8d7c46655af5e1890b182378bff
This commit is contained in:
Steve Fink 2016-07-29 12:02:12 -07:00
parent 603c64c98b
commit 1df7b43d0c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/devtools/automation/autospider.py
View File

@ -107,11 +107,15 @@ def set_vars_from_script(script, vars):
env[var] = "%s;%s" % (env[var], originals[var])
def call_alternates(binaries, command_args, *args, **kwargs):
def call_alternates(binaries, *args, **kwargs):
last_exception = None
for binary in binaries:
try:
return subprocess.call(['sh', '-c', binary] + command_args, *args, **kwargs)
# Call through a shell due to Windows portability problems.
rc = subprocess.call(['sh', '-c', binary], *args, **kwargs)
if rc == 127:
raise OSError("command not found: %s" % binary)
return rc
except OSError as e:
# Assume the binary was not found.
last_exception = e
@ -140,7 +144,7 @@ if args.variant == 'nonunified':
if not args.nobuild:
autoconfs = ['autoconf-2.13', 'autoconf2.13', 'autoconf213']
if call_alternates(autoconfs, [], cwd=DIR.js_src) != 0:
if call_alternates(autoconfs, cwd=DIR.js_src) != 0:
logging.error('autoconf failed')
sys.exit(1)