aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2019-04-23 11:19:14 +0200
committerThomas Huth <thuth@redhat.com>2019-05-21 10:07:29 +0200
commit4a715461c8eab628e79b1e6889d650455e043b88 (patch)
tree1bc47c584bd1bca3738583bd139f8002936a5709 /tests
parentb807a99369ef534b9e7c10f34f8c64ce708332f3 (diff)
tests/qemu-iotests/check: Pick a default machine if necessary
qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have a default machine, so when running the qemu-iotests with such a binary, lots of tests are failing. Fix it by picking a default machine in the "check" script instead. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Message-Id: <20190502084506.8009-3-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qemu-iotests/check13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index f9c24b6753..922c5d1d3d 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -130,7 +130,6 @@ export CACHEMODE="writeback"
export QEMU_IO_OPTIONS=""
export QEMU_IO_OPTIONS_NO_FMT=""
export CACHEMODE_IS_DEFAULT=true
-export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
export VALGRIND_QEMU=
export IMGKEYSECRET=
export IMGOPTSSYNTAX=false
@@ -564,6 +563,18 @@ then
fi
export QEMU_PROG="$(type -p "$QEMU_PROG")"
+case "$QEMU_PROG" in
+ *qemu-system-arm|*qemu-system-aarch64)
+ export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
+ ;;
+ *qemu-system-tricore)
+ export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
+ ;;
+ *)
+ export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
+ ;;
+esac
+
if [ -z "$QEMU_IMG_PROG" ]; then
if [ -x "$build_iotests/qemu-img" ]; then
export QEMU_IMG_PROG="$build_iotests/qemu-img"