aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.include
diff options
context:
space:
mode:
authorCleber Rosa <crosa@redhat.com>2019-08-26 11:58:32 -0400
committerEduardo Habkost <ehabkost@redhat.com>2019-08-27 16:57:24 -0300
commit406ab2f331555cfcf320fe2a77949d7f8af7ab32 (patch)
tree05370dee5173e523b58cb2a0e61015722ef16ea0 /tests/Makefile.include
parent73a5a775d273d34221889dc91be7580e26a9584d (diff)
downloadqemu-406ab2f331555cfcf320fe2a77949d7f8af7ab32.zip
qemu-406ab2f331555cfcf320fe2a77949d7f8af7ab32.tar.gz
qemu-406ab2f331555cfcf320fe2a77949d7f8af7ab32.tar.bz2
configure: more resilient Python version capture
The current approach to capture the Python version is fragile, as it was demonstrated by a very specific build of Python 3 on Fedora 29 that, under non-interactive shells would print multiline version information. The (badly) stripped version output would be sent to config-host.mak, producing bad syntax and rendering the makefiles unusable. Now, the Python versions is printed by configure, but only a simple (and better controlled variable) indicating whether the build system is using Python 2 is kept on config-host.mak. Signed-off-by: Cleber Rosa <crosa@redhat.com> Message-Id: <20190826155832.17427-1-crosa@redhat.com> Reviewed-by: Tony Nguyen <tony.nguyen@bt.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'tests/Makefile.include')
-rw-r--r--tests/Makefile.include2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 49684fd..f5ac095 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1135,7 +1135,7 @@ TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results
AVOCADO_SHOW=app
AVOCADO_TAGS=$(patsubst %-softmmu,-t arch:%, $(filter %-softmmu,$(TARGET_DIRS)))
-ifneq ($(findstring v2,"v$(PYTHON_VERSION)"),v2)
+ifneq ($(PYTHON2),y)
$(TESTS_VENV_DIR): $(TESTS_VENV_REQ)
$(call quiet-command, \
$(PYTHON) -m venv --system-site-packages $@, \