[qemu-xen staging] iotests: Select a default machine for the rx and avr targets

[patchbot@xxxxxxx]

commit 733dafe4914ef2e6d6a9d546b7fdbb429f3590e7
Author:     Thomas Huth <thuth@xxxxxxxxxx>
AuthorDate: Wed Jul 22 18:19:08 2020 +0200
Commit:     Max Reitz <mreitz@xxxxxxxxxx>
CommitDate: Mon Jul 27 12:37:25 2020 +0200

    iotests: Select a default machine for the rx and avr targets
    
    If you are building only with either the new rx-softmmu or avr-softmmu
    target, "make check-block" fails a couple of tests since there is no
    default machine defined in these new targets. We have to select a machine
    in the "check" script for these, just like we already do for the arm- and
    tricore-softmmu targets.
    
    Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
    Message-Id: <20200722161908.25383-1-thuth@xxxxxxxxxx>
    Signed-off-by: Max Reitz <mreitz@xxxxxxxxxx>
---
 tests/qemu-iotests/check | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index e0d8049012..0657f7286c 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -595,15 +595,19 @@ then
 fi
 export QEMU_PROG="$(type -p "$QEMU_PROG")"
 
+export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
 case "$QEMU_PROG" in
     *qemu-system-arm|*qemu-system-aarch64)
-        export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel 
qtest"
+        export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt"
         ;;
-    *qemu-system-tricore)
-        export QEMU_OPTIONS="-nodefaults -display none -machine 
tricore_testboard -accel qtest"
+    *qemu-system-avr)
+        export QEMU_OPTIONS="$QEMU_OPTIONS -machine mega2560"
+        ;;
+    *qemu-system-rx)
+        export QEMU_OPTIONS="$QEMU_OPTIONS -machine gdbsim-r5f562n8"
         ;;
-    *)
-        export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
+    *qemu-system-tricore)
+        export QEMU_OPTIONS="-$QEMU_OPTIONS -machine tricore_testboard"
         ;;
 esac
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging