Bug 1426209: Allow passing `--extra-config-path in L10N tasks; r=jlund

MozReview-Commit-ID: FCG2K9L5Z3T

--HG--
extra : rebase_source : 9536c96f8aa7445149a7075b34310870d768f219
This commit is contained in:
Tom Prince 2017-11-27 13:47:29 -07:00
Родитель 864714bf41
Коммит df534f30a9
2 изменённых файлов: 11 добавлений и 0 удалений

Просмотреть файл

@ -15,6 +15,7 @@ echo "running as" $(id)
: MOZHARNESS_SCRIPT ${MOZHARNESS_SCRIPT}
: MOZHARNESS_CONFIG ${MOZHARNESS_CONFIG}
: MOZHARNESS_CONFIG_PATHS ${MOZHARNESS_CONFIG_PATHS}
: MOZHARNESS_ACTIONS ${MOZHARNESS_ACTIONS}
: MOZHARNESS_OPTIONS ${MOZHARNESS_OPTIONS}
@ -64,6 +65,11 @@ fi
# entirely effective.
export TOOLTOOL_CACHE
config_path_cmds=""
for path in ${MOZHARNESS_CONFIG_PATHS}; do
config_path_cmds="${config_path_cmds} --extra-config-path ${WORKSPACE}/build/src/${path}"
done
# support multiple, space delimited, config files
config_cmds=""
for cfg in $MOZHARNESS_CONFIG; do
@ -95,6 +101,7 @@ python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
--revision ${GECKO_HEAD_REV} \
$actions \
$options \
${config_path_cmds} \
${config_cmds} \
--log-level=debug \
--scm-level=$MOZ_SCM_LEVEL \

Просмотреть файл

@ -65,6 +65,10 @@ l10n_description_schema = Schema({
# Config files passed to the mozharness script
Required('config'): _by_platform([basestring]),
# Additional paths to look for mozharness configs in. These should be
# relative to the base of the source checkout
Optional('config-paths'): _by_platform([basestring]),
# Options to pass to the mozharness script
Required('options'): _by_platform([basestring]),