On Fri, Nov 10, 2023 at 11:00 AM BALATON Zoltan <bala...@eik.bme.hu> wrote:
> > +if test "$download" = "enabled" ; then
> > + mkvenv_online_flag=" --online"
>
> Is leading space before -- intended? It does not seem to matter at usees
> below.
Maybe it's paranoia but I was worried that some shells would mess up
"echo --foo". They did in the past, but it was many years ago. It would
be useful to add a
print() {
printf '%s\n' "$*"
}
shell function but this was not the right patch to do it.
Paolo
> Regards,
> BALATON Zolatn
>
> > fi
> >
> > if test "$docs" != "disabled" ; then
> > if ! $mkvenv ensuregroup \
> > - $mkvenv_flags \
> > + $(test "$docs" = "enabled" && echo "$mkvenv_online_flag") \
> > ${source_path}/pythondeps.toml docs;
> > then
> > if test "$docs" = "enabled" ; then
> > @@ -1631,6 +1631,7 @@ if test "$container" != no; then
> > fi
> > echo "SUBDIRS=$subdirs" >> $config_host_mak
> > echo "PYTHON=$python" >> $config_host_mak
> > +echo "MKVENV_ENSUREGROUP=$mkvenv ensuregroup $mkvenv_online_flag" >>
> > $config_host_mak
> > echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
> > echo "MESON=$meson" >> $config_host_mak
> > echo "NINJA=$ninja" >> $config_host_mak
> > diff --git a/tests/Makefile.include b/tests/Makefile.include
> > index dab1989a071..c9d1674bd07 100644
> > --- a/tests/Makefile.include
> > +++ b/tests/Makefile.include
> > @@ -111,7 +111,7 @@ quiet-venv-pip = $(quiet-@)$(call quiet-command-run, \
> >
> > $(TESTS_VENV_TOKEN): $(SRC_PATH)/pythondeps.toml
> > $(call quiet-venv-pip,install -e "$(SRC_PATH)/python/")
> > - $(PYTHON) python/scripts/mkvenv.py ensuregroup --online $< avocado
> > + $(MKVENV_ENSUREGROUP) $< avocado
> > $(call quiet-command, touch $@)
> >
> > $(TESTS_RESULTS_DIR):
> >
>
