Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1361912 - Don't invoke mach build through bash.exe; r=ted

Browse Source 
Executing `mach build` through bash.exe was introduced by
5f379c98b962 / bug 1279011. Why, I don't know. Literally every
other invocation of `mach` in mozharness does it directly
or via a Python executable (the latter is necessary on Windows
since `mach` is not a win32 executable).

So, this commit removes bash.exe and executes `mach` via
Python like everyone else.

MozReview-Commit-ID: GFNUVbfHZdq

--HG--
extra : source : ca3dddda32b0274d2ed8d700527b2383da36be2c
extra : histedit_source : 5ed18555204cf1fb60ffbf18e13aac13408b4088
This commit is contained in:
Gregory Szorc 2017-05-03 18:16:58 -07:00
parent d401587884
commit 19b74721c5
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -1635,16 +1635,8 @@ or run without that action (ie: --no-{action})"
buildprops,
os.path.join(dirs['abs_work_dir'], 'buildprops.json'))
if 'MOZILLABUILD' in os.environ:
mach = [
os.path.join(os.environ['MOZILLABUILD'], 'msys', 'bin', 'bash.exe'),
os.path.join(dirs['abs_src_dir'], 'mach')
]
else:
mach = [sys.executable, 'mach']
return_code = self.run_command_m(
command=mach + ['--log-no-times', 'build', '-v'],
command=[sys.executable, 'mach', '--log-no-times', 'build', '-v'],
cwd=dirs['abs_src_dir'],
env=env,
output_timeout=self.config.get('max_build_output_timeout', 60 * 40)