ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Huth 2019-04-23 11:19:14 +02:00
parent b807a99369
commit 4a715461c8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/qemu-iotests/check
View File

@ -130,7 +130,6 @@ export CACHEMODE="writeback"
export QEMU_IO_OPTIONS="" export QEMU_IO_OPTIONS=""
export QEMU_IO_OPTIONS_NO_FMT="" export QEMU_IO_OPTIONS_NO_FMT=""
export CACHEMODE_IS_DEFAULT=true export CACHEMODE_IS_DEFAULT=true
export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
export VALGRIND_QEMU= export VALGRIND_QEMU=
export IMGKEYSECRET= export IMGKEYSECRET=
export IMGOPTSSYNTAX=false export IMGOPTSSYNTAX=false
@ -564,6 +563,18 @@ then
fi fi
export QEMU_PROG="$(type -p "$QEMU_PROG")" 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 [ -z "$QEMU_IMG_PROG" ]; then
if [ -x "$build_iotests/qemu-img" ]; then if [ -x "$build_iotests/qemu-img" ]; then
export QEMU_IMG_PROG="$build_iotests/qemu-img" export QEMU_IMG_PROG="$build_iotests/qemu-img"