Backed out changeset 47e2dfac99d5 (bug 1223385) on request for still failing on android

This commit is contained in:
Carsten "Tomcat" Book 2016-01-15 13:52:19 +01:00
parent bab6c54aa6
commit 7299328339
2 changed files with 13 additions and 13 deletions

View File

@ -31,19 +31,6 @@ class LocalesMixin(ChunkingMixin):
self.gecko_locale_revisions = None
self.l10n_revisions = {}
def _get_mach_executable(self):
python = self.query_exe('python2.7')
return [python, 'mach']
def _mach(self, target, env, halt_on_failure=True, output_parser=None):
dirs = self.query_abs_dirs()
mach = self._get_mach_executable()
return self.run_command(mach + target,
halt_on_failure=True,
env=env,
cwd=dirs['abs_mozilla_dir'],
output_parser=None)
def query_locales(self):
if self.locales is not None:
return self.locales

View File

@ -606,12 +606,25 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
self.copyfile(src, dst)
self.read_from_file(dst, verbose=True)
def _mach(self, target, env, halt_on_failure=True, output_parser=None):
dirs = self.query_abs_dirs()
mach = self._get_mach_executable()
return self.run_command(mach + target,
halt_on_failure=True,
env=env,
cwd=dirs['abs_mozilla_dir'],
output_parser=None)
def _mach_configure(self):
"""calls mach configure"""
env = self.query_bootstrap_env()
target = ["configure"]
return self._mach(target=target, env=env)
def _get_mach_executable(self):
python = self.query_exe('python2.7')
return [python, 'mach']
def _get_make_executable(self):
config = self.config
dirs = self.query_abs_dirs()