aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2021-02-02 15:28:02 +0100
committerKevin Wolf <kwolf@redhat.com>2021-02-02 17:05:04 +0100
commitca502ca60dab85b11a7fad5978ab3de94c296fb6 (patch)
treedd00584cd85be7da32f4cd25641ba8b02aa8e250
parentd0bc412302e6f32e65835a83ddefa656c7d7e9ba (diff)
downloadqemu-ca502ca60dab85b11a7fad5978ab3de94c296fb6.zip
qemu-ca502ca60dab85b11a7fad5978ab3de94c296fb6.tar.gz
qemu-ca502ca60dab85b11a7fad5978ab3de94c296fb6.tar.bz2
iotests: Revert emulator selection to old behaviour
If the qemu-system-{arch} binary for the host architecture can't be found, the old 'check' implementation selected the alphabetically first system emulator binary that it could find. The new Python implementation just uses the first result of glob.iglob(), which has an undefined order. This is a problem that breaks CI because the iotests aren't actually prepared to run on any emulator. They should be, so this is really a bug in the failing test cases that should be fixed there, but as a quick fix, let's revert to the old behaviour to let CI runs succeed again. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20210202142802.119999-1-kwolf@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--tests/qemu-iotests/testenv.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
index b31275f..1fbec85 100644
--- a/tests/qemu-iotests/testenv.py
+++ b/tests/qemu-iotests/testenv.py
@@ -135,7 +135,7 @@ class TestEnv(ContextManager['TestEnv']):
if not os.path.exists(self.qemu_prog):
pattern = root('qemu-system-*')
try:
- progs = glob.iglob(pattern)
+ progs = sorted(glob.iglob(pattern))
self.qemu_prog = next(p for p in progs if isxfile(p))
except StopIteration:
sys.exit("Not found any Qemu executable binary by pattern "