Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into s…

…taging 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 "[email protected]" # gpg: Good signature from "Kevin Wolf <[email protected]>" [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 <[email protected]>
AFLplusplus · Jan 29, 2021 · 3701c07 · 3701c07
2 parents 5101d00 + 4cea90b
commit 3701c07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -248,7 +248,7 @@ def do_run_test(self, test: str) -> TestResult:
 
         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