OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests: respect --enable/--disable-download for Avocado

Browse Source 
Pass the content of $mkvenv_flags (which is either "--online"
or empty) down to tests/Makefile.include.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-11-10 09:37:34 +01:00
parent adff55b520
commit 913e47cb6b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -968,14 +968,14 @@ meson="$(cd pyvenv/bin; pwd)/meson"
# Conditionally ensure Sphinx is installed. # Conditionally ensure Sphinx is installed.
mkvenv_flags="" mkvenv_online_flag=""
if test "$download" = "enabled" -a "$docs" = "enabled" ; then if test "$download" = "enabled" ; then
mkvenv_flags="--online" mkvenv_online_flag=" --online"
fi fi
if test "$docs" != "disabled" ; then if test "$docs" != "disabled" ; then
if ! $mkvenv ensuregroup \ if ! $mkvenv ensuregroup \
$mkvenv_flags \ $(test "$docs" = "enabled" && echo "$mkvenv_online_flag") \
${source_path}/pythondeps.toml docs; ${source_path}/pythondeps.toml docs;
then then
if test "$docs" = "enabled" ; then if test "$docs" = "enabled" ; then
@ -1634,6 +1634,7 @@ if test "$container" != no; then
fi fi
echo "SUBDIRS=$subdirs" >> $config_host_mak echo "SUBDIRS=$subdirs" >> $config_host_mak
echo "PYTHON=$python" >> $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 "GENISOIMAGE=$genisoimage" >> $config_host_mak
echo "MESON=$meson" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak
echo "NINJA=$ninja" >> $config_host_mak echo "NINJA=$ninja" >> $config_host_mak

2
tests/Makefile.include
View File

@ -111,7 +111,7 @@ quiet-venv-pip = $(quiet-@)$(call quiet-command-run, \
$(TESTS_VENV_TOKEN): $(SRC_PATH)/pythondeps.toml $(TESTS_VENV_TOKEN): $(SRC_PATH)/pythondeps.toml
$(call quiet-venv-pip,install -e "$(SRC_PATH)/python/") $(call quiet-venv-pip,install -e "$(SRC_PATH)/python/")
$(PYTHON) python/scripts/mkvenv.py ensuregroup --online $< avocado $(MKVENV_ENSUREGROUP) $< avocado
$(call quiet-command, touch $@) $(call quiet-command, touch $@)
$(TESTS_RESULTS_DIR): $(TESTS_RESULTS_DIR):