Bug 1361912 - Don't invoke `mach build` through bash.exe; r=ted
authorGregory Szorc <gps@mozilla.com>
Wed, 03 May 2017 18:16:58 -0700
changeset 358542 843439b1f0d5e8abbe9131a6da856cf5a959e87e
parent 358541 481da97f0f1015e3630d6c1b5d1fc44e58cf952a
child 358543 f7d5aedd57e442dd287f9893f959f400bb3a5b42
push id90352
push usercbook@mozilla.com
push dateTue, 16 May 2017 13:09:14 +0000
treeherdermozilla-inbound@8f89d291e303 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1361912, 1279011
milestone55.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 1361912 - Don't invoke `mach build` through bash.exe; r=ted 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
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -1612,26 +1612,18 @@ or run without that action (ie: --no-{ac
         dirs = self.query_abs_dirs()
         buildprops = os.path.join(dirs['base_work_dir'], 'buildprops.json')
         # not finding buildprops is not an error outside of buildbot
         if os.path.exists(buildprops):
             self.copyfile(
                 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)
         )
         if return_code:
             self.return_code = self.worst_level(
                 EXIT_STATUS_DICT[TBPL_FAILURE],  self.return_code,
                 AUTOMATION_EXIT_CODES[::-1]