aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-07-28 09:15:44 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-07-28 09:15:44 +0100
commit23ae28783f4674e98f7539d1c05d793166c2fc12 (patch)
treee09b0157015b6030d305d117eb01e0eb54706e2a /tests
parent93ea484375ab473379dd9c836261ef484bd71ab1 (diff)
parent1855536256eb0a5708b04b85f744de69559ea323 (diff)
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-07-27' into staging
Block patches for 5.1: - Coverity fix - iotests fix for rx and avr - iotests fix for qcow2 -o compat=0.10 # gpg: Signature made Mon 27 Jul 2020 15:36:23 BST # gpg: using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40 # gpg: issuer "mreitz@redhat.com" # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full] # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * remotes/maxreitz/tags/pull-block-2020-07-27: iotests/197: Fix for compat=0.10 iotests: Select a default machine for the rx and avr targets block/amend: Check whether the node exists Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qemu-iotests/1974
-rwxr-xr-xtests/qemu-iotests/check14
2 files changed, 12 insertions, 6 deletions
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 95f05b0e34..121959a09c 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -112,7 +112,9 @@ echo
echo '=== Partial final cluster ==='
echo
-_make_test_img 1024
+# Force compat=1.1, because writing zeroes on a v2 image without a
+# backing file would just result in an unallocated cluster
+_make_test_img -o compat=1.1 1024
$QEMU_IO -f $IMGFMT -C -c 'read 0 1024' "$TEST_IMG" | _filter_qemu_io
$QEMU_IO -f $IMGFMT -c map "$TEST_IMG"
_check_test_img
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