mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1237182: Fix android l10n nightlies a=bustage 

Missed some references to run_command_m, get_output_from_command_m when
removing the mock mixin.

--HG--
extra : amend_source : 03626d4f65d06eaffab0ee754a9547d5624baa09
extra : histedit_source : 13bacfc1ccff78a1e17c996f66465439a7aa16dc
This commit is contained in:
Chris AtLee 2018-05-19 07:38:16 -04:00
Родитель 0bb5e5ba36
Коммит 0e80033a10
1 изменённых файлов: 32 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

64
testing/mozharness/scripts/mobile_l10n.py
Просмотреть файл

@ -228,11 +228,11 @@ class MobileSingleLocale(LocalesMixin, ReleaseMixin,
return self.make_ident_output return self.make_ident_output
env = self.query_repack_env() env = self.query_repack_env()
dirs = self.query_abs_dirs() dirs = self.query_abs_dirs()
output = self.get_output_from_command_m(["make", "ident"], output = self.get_output_from_command(["make", "ident"],
cwd=dirs['abs_locales_dir'], cwd=dirs['abs_locales_dir'],
env=env, env=env,
silent=True, silent=True,
halt_on_failure=True) halt_on_failure=True)
parser = OutputParser(config=self.config, log_obj=self.log_obj, parser = OutputParser(config=self.config, log_obj=self.log_obj,
error_list=MakefileErrorList) error_list=MakefileErrorList)
parser.add_lines(output) parser.add_lines(output)
@ -290,7 +290,7 @@ class MobileSingleLocale(LocalesMixin, ReleaseMixin,
if make_args is None: if make_args is None:
make_args = [] make_args = []
# TODO error checking # TODO error checking
output = self.get_output_from_command_m( output = self.get_output_from_command(
[make, "echo-variable-%s" % variable] + make_args, [make, "echo-variable-%s" % variable] + make_args,
cwd=dirs['abs_locales_dir'], silent=True, cwd=dirs['abs_locales_dir'], silent=True,
env=env env=env
@ -414,10 +414,10 @@ class MobileSingleLocale(LocalesMixin, ReleaseMixin,
mach = os.path.join(dirs['abs_mozilla_dir'], 'mach') mach = os.path.join(dirs['abs_mozilla_dir'], 'mach')
if self.run_command_m([sys.executable, mach, 'configure'], if self.run_command([sys.executable, mach, 'configure'],
cwd=dirs['abs_mozilla_dir'], cwd=dirs['abs_mozilla_dir'],
env=env, env=env,
error_list=MakefileErrorList): error_list=MakefileErrorList):
self.fatal("Configure failed!") self.fatal("Configure failed!")
# Invoke the build system to get nsinstall and buildid.h. # Invoke the build system to get nsinstall and buildid.h.
@ -431,11 +431,11 @@ class MobileSingleLocale(LocalesMixin, ReleaseMixin,
env = dict(env) env = dict(env)
env['MOZ_BUILD_DATE'] = str(buildid) env['MOZ_BUILD_DATE'] = str(buildid)
self.run_command_m([sys.executable, mach, 'build'] + targets, self.run_command([sys.executable, mach, 'build'] + targets,
cwd=dirs['abs_mozilla_dir'], cwd=dirs['abs_mozilla_dir'],
env=env, env=env,
error_list=MakefileErrorList, error_list=MakefileErrorList,
halt_on_failure=True) halt_on_failure=True)
def setup(self): def setup(self):
c = self.config c = self.config
@ -446,7 +446,7 @@ class MobileSingleLocale(LocalesMixin, ReleaseMixin,
# TODO stop using cat # TODO stop using cat
cat = self.query_exe("cat") cat = self.query_exe("cat")
make = self.query_exe("make") make = self.query_exe("make")
self.run_command_m([cat, mozconfig_path]) self.run_command([cat, mozconfig_path])
env = self.query_repack_env() env = self.query_repack_env()
if self.config.get("tooltool_config"): if self.config.get("tooltool_config"):
self.tooltool_fetch( self.tooltool_fetch(
@ -454,16 +454,16 @@ class MobileSingleLocale(LocalesMixin, ReleaseMixin,
output_dir=self.config['tooltool_config']['output_dir'] % self.query_abs_dirs(), output_dir=self.config['tooltool_config']['output_dir'] % self.query_abs_dirs(),
) )
self._setup_configure() self._setup_configure()
self.run_command_m([make, "wget-en-US"], self.run_command([make, "wget-en-US"],
cwd=dirs['abs_locales_dir'], cwd=dirs['abs_locales_dir'],
env=env, env=env,
error_list=MakefileErrorList, error_list=MakefileErrorList,
halt_on_failure=True) halt_on_failure=True)
self.run_command_m([make, "unpack"], self.run_command([make, "unpack"],
cwd=dirs['abs_locales_dir'], cwd=dirs['abs_locales_dir'],
env=env, env=env,
error_list=MakefileErrorList, error_list=MakefileErrorList,
halt_on_failure=True) halt_on_failure=True)
def repack(self): def repack(self):
# TODO per-locale logs and reporting. # TODO per-locale logs and reporting.
@ -474,11 +474,11 @@ class MobileSingleLocale(LocalesMixin, ReleaseMixin,
success_count = total_count = 0 success_count = total_count = 0
for locale in locales: for locale in locales:
total_count += 1 total_count += 1
if self.run_command_m([make, "installers-%s" % locale], if self.run_command([make, "installers-%s" % locale],
cwd=dirs['abs_locales_dir'], cwd=dirs['abs_locales_dir'],
env=repack_env, env=repack_env,
error_list=MakefileErrorList, error_list=MakefileErrorList,
halt_on_failure=False): halt_on_failure=False):
self.add_failure(locale, message="%s failed in make installers-%s!" % self.add_failure(locale, message="%s failed in make installers-%s!" %
(locale, locale)) (locale, locale))
continue continue
@ -525,7 +525,7 @@ class MobileSingleLocale(LocalesMixin, ReleaseMixin,
self.warning("Skipping previously failed locale %s." % locale) self.warning("Skipping previously failed locale %s." % locale)
continue continue
total_count += 1 total_count += 1
output = self.get_output_from_command_m( output = self.get_output_from_command(
# Ugly hack to avoid |make upload| stderr from showing up # Ugly hack to avoid |make upload| stderr from showing up
# as get_output_from_command errors # as get_output_from_command errors
"%s upload AB_CD=%s 2>&1" % (make, locale), "%s upload AB_CD=%s 2>&1" % (make, locale),