Skip to content

Commit 733dafe

Browse files
huthXanClic
authored andcommitted
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 <[email protected]> Message-Id: <[email protected]> Signed-off-by: Max Reitz <[email protected]>
1 parent 984c367 commit 733dafe

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

tests/qemu-iotests/check

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -595,15 +595,19 @@ then
595595
fi
596596
export QEMU_PROG="$(type -p "$QEMU_PROG")"
597597

598+
export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
598599
case "$QEMU_PROG" in
599600
*qemu-system-arm|*qemu-system-aarch64)
600-
export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest"
601+
export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt"
601602
;;
602-
*qemu-system-tricore)
603-
export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest"
603+
*qemu-system-avr)
604+
export QEMU_OPTIONS="$QEMU_OPTIONS -machine mega2560"
605+
;;
606+
*qemu-system-rx)
607+
export QEMU_OPTIONS="$QEMU_OPTIONS -machine gdbsim-r5f562n8"
604608
;;
605-
*)
606-
export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
609+
*qemu-system-tricore)
610+
export QEMU_OPTIONS="-$QEMU_OPTIONS -machine tricore_testboard"
607611
;;
608612
esac
609613

0 commit comments

Comments
 (0)