diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-29 15:49:29 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-29 15:49:29 +0000 |
| commit | 3701c07e63bb945137bf80fe35e7058ad3784c45 (patch) | |
| tree | afa03ec84821b5d9c9d86a9c38ba9863dd057b55 /tests | |
| parent | 5101d00d2f1138a73344dc4833587f76d7a5fa5c (diff) | |
| parent | 4cea90be62f4f15a63e1a8f7d5d0958f79fdf290 (diff) | |
| download | qemu-3701c07e63bb945137bf80fe35e7058ad3784c45.zip qemu-3701c07e63bb945137bf80fe35e7058ad3784c45.tar.gz qemu-3701c07e63bb945137bf80fe35e7058ad3784c45.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- Fix iotests to respect configured Python binary
# gpg: Signature made Fri 29 Jan 2021 14:51:01 GMT
# gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg: issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
tests/Makefile.include: export PYTHON for check-block.sh
iotests/testrunner: fix recognition of python tests
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 1 | ||||
| -rw-r--r-- | tests/qemu-iotests/testrunner.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 3a0524c..ceaf3f0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -138,6 +138,7 @@ check: ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy) QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF) check: check-block +export PYTHON check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \ qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ $(filter qemu-system-%, $(ninja-targets)) diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunner.py index a581be6..24b3fba 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -248,7 +248,7 @@ class TestRunner(ContextManager['TestRunner']): with f_test.open(encoding="utf-8") as f: try: - if f.readline() == '#!/usr/bin/env python3': + if f.readline().rstrip() == '#!/usr/bin/env python3': args.insert(0, self.env.python) except UnicodeDecodeError: # binary test? for future. pass |