From 581fcfe33528451549e73865a84d1cdea659625c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Thu, 5 Nov 2020 10:31:27 +0000
Subject: [PATCH] Remove conditionals for skipping/ignoring tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The conditionals for completely skipping testing, or ignoring all test
failures are much too big a hammer. They are resulting in seriously
broken QEMU binaries making their way into the rawhide repos.

When failures happen the smallest possible number of individual tests
need to be disabled/skipped, but *only* if failure is confined to the
test suite. If there are problems affecting functionality in QEMU
itself, the build should not be forced through, instead QEMU must be
fixed before a build is made.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 qemu.spec | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/qemu.spec b/qemu.spec
index 3fc935c..8bd2b83 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1402,10 +1402,6 @@ chmod +x %{buildroot}%{_libdir}/qemu/*.so
 
 
 %check
-%global tests_skip 0
-# Enable this temporarily if tests are broken
-%global tests_nofail 0
-
 # 2020-08-31: tests passing, but s390x fails due to
 # spurious warning breaking an iotest case
 # https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg03279.html
@@ -1414,12 +1410,7 @@ perl -i -p -e 's/^(127|267)/# $1/' tests/qemu-iotests/group
 %endif
 
 pushd build-dynamic
-%if !%{tests_skip}
-%if %{tests_nofail}
- make check V=1 || :
-%else
- make check V=1
-%endif
+make check V=1
 
 # Check the binary runs (see eg RHBZ#998722).
 b="./x86_64-softmmu/qemu-system-x86_64"
@@ -1432,7 +1423,6 @@ echo "Trying to boot kernel $KERNEL with %{?hostqemu}"
 qemu-sanity-check --qemu=%{?hostqemu} --kernel=$KERNEL
 %endif
 
-%endif
 popd