From fcf47181da6df2cc690e1681120e4b7b85999ad8 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Jan 10 2023 18:05:30 +0000 Subject: Re-enable running of iotests 6 months and 2 QEMU release later, we want to test if they are more reliable now. At least we'll get better diagnostic of which test is hanging since the patch in https://www.mail-archive.com/qemu-devel@nongnu.org/msg887683.html is included in this QEMU Signed-off-by: Daniel P. Berrangé --- diff --git a/0010-Skip-iotests-entirely.patch b/0010-Skip-iotests-entirely.patch deleted file mode 100644 index 8586d6f..0000000 --- a/0010-Skip-iotests-entirely.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 49c0aa5..6bbeef4 100644 --- a/qemu.spec +++ b/qemu.spec @@ -339,7 +339,6 @@ Patch: 0001-tests-Disable-pci_virtio_vga-for-ppc64.patch # Fix compat with kernel-headers >= 6.1 Patch: 0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch Patch: 0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch -Patch: 0010-Skip-iotests-entirely.patch BuildRequires: meson >= %{meson_version} BuildRequires: zlib-devel @@ -2749,6 +2748,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog * Tue Jan 10 2023 Daniel P. Berrangé - 7.2.0-3 - Fix compat with linux > 6.1 headers +- Re-enable iotests * Tue Jan 03 2023 Richard W.M. Jones - 2:7.2.0-2 - Rebuild for xen-4.17.0