Bug 1412356 - Invoke `mach build` for multi locale builds; r?build draft
authorGregory Szorc <gps@mozilla.com>
Fri, 27 Oct 2017 10:10:14 -0700
changeset 690318 5f1aaed00de282c8579f68c853d3430530c03b75
parent 690317 a2337cf61c064b21bfeac9f14fa73fa27badb699
child 690319 d60b603ad03eca5ef28ddd205774f54a69731558
push id87281
push usergszorc@mozilla.com
push dateWed, 01 Nov 2017 21:44:15 +0000
reviewersbuild
bugs1412356
milestone58.0a1
Bug 1412356 - Invoke `mach build` for multi locale builds; r?build This should be functionally identical to `make -f client.mk`. MozReview-Commit-ID: GfKHtezLBNL
testing/mozharness/mozharness/mozilla/l10n/multi_locale_build.py
--- a/testing/mozharness/mozharness/mozilla/l10n/multi_locale_build.py
+++ b/testing/mozharness/mozharness/mozilla/l10n/multi_locale_build.py
@@ -122,19 +122,20 @@ class MultiLocaleBuild(LocalesMixin, Mer
     # pull_locale_source() defined in LocalesMixin.
 
     def build(self):
         c = self.config
         dirs = self.query_abs_dirs()
         self.copyfile(os.path.join(dirs['abs_work_dir'], c['mozconfig']),
                       os.path.join(dirs['abs_mozilla_dir'], 'mozconfig'),
                       error_level=FATAL)
-        command = "make -f client.mk build"
+
+        mach = os.path.join(dirs['abs_mozilla_dir'], 'mach')
         env = self.query_env()
-        if self._process_command(command=command,
+        if self._process_command(command=[sys.executable, mach, 'build'],
                                  cwd=dirs['abs_mozilla_dir'],
                                  env=env, error_list=MakefileErrorList):
             self.fatal("Erroring out after the build failed.")
 
     def add_locales(self):
         c = self.config
         dirs = self.query_abs_dirs()
         locales = self.query_locales()