From 2f2f662015f4de56fe6d509cc13bee710177316a Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Oct 17 2023 15:31:50 +0000
Subject: spec: Use MTESTARGS to disable iotests, not a patch


Signed-off-by: Cole Robinson <crobinso@redhat.com>

---

diff --git a/0001-tests-Disable-iotests-like-RHEL-does.patch b/0001-tests-Disable-iotests-like-RHEL-does.patch
deleted file mode 100644
index 09706e5..0000000
--- a/0001-tests-Disable-iotests-like-RHEL-does.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e4a112c75a02a789e7710e805f66211426087d55 Mon Sep 17 00:00:00 2001
-Message-ID: <e4a112c75a02a789e7710e805f66211426087d55.1692544104.git.crobinso@redhat.com>
-From: Cole Robinson <crobinso@redhat.com>
-Date: Sun, 20 Aug 2023 10:49:12 -0400
-Subject: [PATCH] tests: Disable iotests, like RHEL does
-Content-type: text/plain
-
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
----
- tests/qemu-iotests/meson.build | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
-index 44761e1e4d..78c5836325 100644
---- a/tests/qemu-iotests/meson.build
-+++ b/tests/qemu-iotests/meson.build
-@@ -51,21 +51,21 @@ foreach format, speed: qemu_iotests_formats
-       check: true,
-   )
- 
--  foreach item: rc.stdout().strip().split()
--      args = [qemu_iotests_check_cmd,
--              '-tap', '-' + format, item,
--              '--source-dir', meson.current_source_dir(),
--              '--build-dir', meson.current_build_dir()]
--      # Some individual tests take as long as 45 seconds
--      # Bump the timeout to 3 minutes for some headroom
--      # on slow machines to minimize spurious failures
--      test('io-' + format + '-' + item,
--           python,
--           args: args,
--           depends: qemu_iotests_binaries,
--           env: qemu_iotests_env,
--           protocol: 'tap',
--           timeout: 180,
--           suite: suites)
--  endforeach
-+#   foreach item: rc.stdout().strip().split()
-+#       args = [qemu_iotests_check_cmd,
-+#               '-tap', '-' + format, item,
-+#               '--source-dir', meson.current_source_dir(),
-+#               '--build-dir', meson.current_build_dir()]
-+#       # Some individual tests take as long as 45 seconds
-+#       # Bump the timeout to 3 minutes for some headroom
-+#       # on slow machines to minimize spurious failures
-+#       test('io-' + format + '-' + item,
-+#            python,
-+#            args: args,
-+#            depends: qemu_iotests_binaries,
-+#            env: qemu_iotests_env,
-+#            protocol: 'tap',
-+#            timeout: 180,
-+#            suite: suites)
-+#   endforeach
- endforeach
--- 
-2.41.0
-
diff --git a/qemu.spec b/qemu.spec
index ab9bf50..6b534fd 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -360,8 +360,6 @@ Source30: kvm-s390x.conf
 Source31: kvm-x86.conf
 Source36: README.tests
 
-Patch0001: 0001-tests-Disable-iotests-like-RHEL-does.patch
-
 BuildRequires: meson >= %{meson_version}
 BuildRequires: bison
 BuildRequires: flex
@@ -2025,6 +2023,10 @@ rm -rf %{static_buildroot}
 
 
 %check
+# Disable iotests. RHEL has done this forever, and these
+# tests have been flakey in the past
+export MTESTARGS="--no-suite block"
+
 %if %{with check}
 %if !%{tools_only}