author | Gregory Szorc <gps@mozilla.com> |
Wed, 03 May 2017 18:16:58 -0700 | |
changeset 358542 | 843439b1f0d5e8abbe9131a6da856cf5a959e87e |
parent 358541 | 481da97f0f1015e3630d6c1b5d1fc44e58cf952a |
child 358543 | f7d5aedd57e442dd287f9893f959f400bb3a5b42 |
push id | 90352 |
push user | cbook@mozilla.com |
push date | Tue, 16 May 2017 13:09:14 +0000 |
treeherder | mozilla-inbound@8f89d291e303 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 1361912, 1279011 |
milestone | 55.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
|
testing/mozharness/mozharness/mozilla/building/buildbase.py | file | annotate | diff | comparison | revisions |
--- 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]