From 8d6927e8dae0a92655645e0988f3068c096c93ea Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Jun 05 2022 16:50:08 +0000 Subject: Skip iotests entirely Getting sporadic failures like described here: https://www.mail-archive.com/qemu-devel@nongnu.org/msg887683.html Signed-off-by: Cole Robinson --- diff --git a/0009-Fix-iotests-with-modules-and-qemu-system-s390x.patch b/0009-Fix-iotests-with-modules-and-qemu-system-s390x.patch index 7dfc87d..d4f84a0 100644 --- a/0009-Fix-iotests-with-modules-and-qemu-system-s390x.patch +++ b/0009-Fix-iotests-with-modules-and-qemu-system-s390x.patch @@ -6,7 +6,7 @@ Content-type: text/plain Signed-off-by: Cole Robinson --- tests/qemu-iotests/common.rc | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 227e0a5be9..97f8e0a15f 100644 diff --git a/0010-Skip-iotests-entirely.patch b/0010-Skip-iotests-entirely.patch new file mode 100644 index 0000000..8586d6f --- /dev/null +++ b/0010-Skip-iotests-entirely.patch @@ -0,0 +1,26 @@ +From: Cole Robinson +Date: Sun, 5 Jun 2022 12:48:29 -0400 +Subject: [PATCH] Skip iotests entirely +Content-type: text/plain + +Getting sporadic failures like described here: +https://www.mail-archive.com/qemu-devel@nongnu.org/msg887683.html + +Signed-off-by: Cole Robinson +--- + tests/check-block.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/check-block.sh b/tests/check-block.sh +index f59496396c..09cc735da4 100755 +--- a/tests/check-block.sh ++++ b/tests/check-block.sh +@@ -50,6 +50,8 @@ fi + + cd tests/qemu-iotests + ++exit 0 ++ + # QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests + export QEMU_CHECK_BLOCK_AUTO=1 + export PYTHONUTF8=1 diff --git a/qemu.spec b/qemu.spec index 93a23a3..299e74d 100644 --- a/qemu.spec +++ b/qemu.spec @@ -356,6 +356,7 @@ Patch0006: 0006-virtio-scsi-clean-up-virtio_scsi_handle_cmd_vq.patch Patch0007: 0007-virtio-scsi-move-request-related-items-from-.h-to-.c.patch Patch0008: 0008-Disable-flakey-dbus-display-test.patch Patch0009: 0009-Fix-iotests-with-modules-and-qemu-system-s390x.patch +Patch0010: 0010-Skip-iotests-entirely.patch BuildRequires: meson >= %{meson_version} BuildRequires: zlib-devel