Block layer patches:

- Fix iotests to respect configured Python binary
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEE3D3rFZqa+V09dFb+fwmycsiPL9YFAmAUINURHGt3b2xmQHJl
 ZGhhdC5jb20ACgkQfwmycsiPL9Y4YRAApxD0DY21w5LWJPVOLgj7jUNtdZEnFlCT
 1SZdWXie1T/+zg6afcQViB+Fqm08FAsPWMtzfVSqFIOjwdwdVcPvCuxd2JVSgyRX
 qgOwbenzJNcq2cYSQFQ6mKm6KGeC7s03vz/HrAQmFopTKVckyGCEeJDrVSvGaVd3
 L78HaKpXcEMuqJfKXpPKvv4OuaEXeXKDJwrm4aGqAE3xW45GFW+dh/s/P66GsYp1
 Gs0mAOHgP+6zNvwozud6NRJGKA7GPRiQn1H+ihiYXwoDRD4cH88iWcyS6cRHZI4W
 pHE3ZGMxGkv/diayRBe5ZodFP3aFZ37iX6BddoLW6gWqSpKV5/BNrQXu/mHTnI0q
 Ml7e78rfZPothPQIxg+cNCcUyFWY1tsqP7iJvFXYcWdpj5Rud6ExO6+oa1rIszTs
 FLyAfZTBrsVCzkMvgcILxf7EhqLh4HzMoXj3RDkHdK1HNpZhAvT81eWWbnYY8pWf
 WeWHovqD5qc0DKv6q1QRdqBPlpk8xE3KieH+0f9J7XMxgrN55GcRm1XzMI8GoUTK
 APGrzK1o3nwQ8iH9Zu1FrOz1wVe8bVl2gsL5xxY+b+l+jImc5HXRn1gLB0a4TRF0
 y+xfK4bRLyvV504vSdjqldNwiPAJ8NLlzRRiMORSnGhYzDj8nzRuFJoDkRCV4coz
 TkuPFNkc5T0=
 =DzRJ
 -----END PGP SIGNATURE-----

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>

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))

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