From 051d7c012bf5c5d430ae6c3c76c67ef57e63f194 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 21 Mar 2014 08:45:57 +0000
Subject: [PATCH] Adjust %check section.

Also disable the virt-sparsify --in-place test on x86 because
of RHBZ#1079210.
---
 libguestfs.spec | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/libguestfs.spec b/libguestfs.spec
index f14a12f..5a7bd8b 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -747,6 +747,9 @@ gzip -9 ChangeLog
 
 
 %check
+
+%if %{runtests}
+
 # Enable debugging - very useful if a test does fail, although
 # it produces masses of output in the build.log.
 export LIBGUESTFS_DEBUG=1
@@ -780,6 +783,19 @@ export SKIP_TEST_MDADM_SH=1
 # Disable NBD test, buggy in qemu 1.7.0 (RHBZ#1034433).
 export SKIP_TEST_NBD_PL=1
 
+# On x86 (32 bit) only, virt-sparsify --in-place cannot sparsify as
+# much as it should.  The error is:
+#   test virt-sparsify: 343156 K -> 25716 K
+#   test virt-sparsify --in-place: size_after (25716) too large
+# (RHBZ#1079210).
+%ifarch %{ix86}
+export SKIP_TEST_VIRT_SPARSIFY_IN_PLACE_SH=1
+%endif
+
+# Disable parallel virt-alignment-scan & virt-df tests (RHBZ#1025942).
+export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
+export SKIP_TEST_VIRT_DF_GUESTS_SH=1
+
 # Skip gnulib tests which fail (probably these are kernel/glibc bugs).
 pushd gnulib/tests
 make -k check ||:
@@ -791,12 +807,6 @@ for f in test-getaddrinfo test-utimens ; do
 done
 popd
 
-# Disable parallel virt-alignment-scan & virt-df tests (RHBZ#1025942).
-export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
-export SKIP_TEST_VIRT_DF_GUESTS_SH=1
-
-%if %{runtests}
-
 # Do make quickcheck first, to fail early if the appliance or libvirt
 # is obviously broken.  Also dump libvirt log files if this happens.
 # Since it's most likely libvirt which is broken, make sure libvirt