[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make ver
From: |
Eduardo Habkost |
Subject: |
[Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make versions |
Date: |
Tue, 6 Nov 2018 12:13:02 -0200 |
User-agent: |
Mutt/1.9.2 (2017-12-15) |
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: Eduardo Habkost <address@hidden>
---
I think that's the cause of the Travis failures. I have
submitted a test job right now, at:
https://travis-ci.org/ehabkost/qemu-hacks/jobs/451387962
Let's see if it fixes the issue.
---
tests/Makefile.include | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index d2e577eabb..074eece558 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -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 $@, \
--
2.18.0.rc1.1.g3f1ff2140
- Re: [Qemu-block] [PULL 11/15] Bootstrap Python venv for tests, Peter Maydell, 2018/11/06
- Re: [Qemu-block] [Qemu-devel] [PULL 11/15] Bootstrap Python venv for tests, Philippe Mathieu-Daudé, 2018/11/06
- [Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make versions,
Eduardo Habkost <=
- Re: [Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make versions, Peter Maydell, 2018/11/06
- Re: [Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make versions, Markus Armbruster, 2018/11/07
- Re: [Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make versions, Peter Maydell, 2018/11/07
- Re: [Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make versions, Eduardo Habkost, 2018/11/07
- Re: [Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make versions, Peter Maydell, 2018/11/07
- Re: [Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make versions, Eduardo Habkost, 2018/11/07
- Re: [Qemu-block] [Qemu-devel] [PATCH] tests: Fix Python 3 detection on older GNU make versions, Markus Armbruster, 2018/11/07
- Re: [Qemu-block] [PATCH] tests: Fix Python 3 detection on older GNU make versions, Cleber Rosa, 2018/11/07