izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Peter Maydell
2021-01-29 15:49:29 +00:00
parent 5101d00d2f 4cea90be62
commit 3701c07e63
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Makefile.include
+1
View File
@@ -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))
tests/qemu-iotests/testrunner.py
+1 -1
View File
@@ -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