Commit 0ca70f19 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Peter Maydell
Browse files

tests: Fix Python 3 detection on older GNU make versions 



The $(SHELLSTATUS) variable requires GNU make >= 4.2, but Travis
seems to provide an older version.  Change the existing rules to
use command output instead of exit code, to make it compatible
with older GNU make versions.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 31eac32a

tests/Makefile.include

+2 −2
Original line number Diff line number Diff line
@@ -913,8 +913,8 @@ TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results 
# information please refer to "avocado --help".

AVOCADO_SHOW=none



$(shell $(PYTHON) -c 'import sys; assert sys.version_info >= (3,0)' >/dev/null 2>&1)

ifeq ($(.SHELLSTATUS),0)

PYTHON3 = $(shell $(PYTHON) -c 'import sys; print(1 if sys.version_info >= (3, 0) else 0)')

ifeq ($(PYTHON3), 1)

$(TESTS_VENV_DIR): $(TESTS_VENV_REQ)

	$(call quiet-command, \

            $(PYTHON) -m venv --system-site-packages $@, \