[libguestfs] Add upstream patch to disable virt-format test, and disable it because wipefs utility is broken.

[Richard W.M. Jones]

commit 46116a25f436d75aebbe3a109e3f9c7ce658d65d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Nov 6 13:08:09 2012 +0000

    Add upstream patch to disable virt-format test, and disable
    it because wipefs utility is broken.

 ...w-virt-format-test-to-be-skipped-by-setti.patch |   29 ++++++++++++++++++++
 libguestfs.spec                                    |   13 ++++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-format-Allow-virt-format-test-to-be-skipped-by-setti.patch b/0001-format-Allow-virt-format-test-to-be-skipped-by-setti.patch
new file mode 100644
index 0000000..6d29a95
--- /dev/null
+++ b/0001-format-Allow-virt-format-test-to-be-skipped-by-setti.patch
@@ -0,0 +1,29 @@
+From 0fa4a5cb0503e28b836d62ec80d1bd93ca31422b Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Tue, 6 Nov 2012 13:05:15 +0000
+Subject: [PATCH] format: Allow virt-format test to be skipped by setting
+ SKIP_TEST_VIRT_FORMAT_SH=1.
+
+---
+ format/test-virt-format.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/format/test-virt-format.sh b/format/test-virt-format.sh
+index 2035e67..a6f81e0 100755
+--- a/format/test-virt-format.sh
++++ b/format/test-virt-format.sh
+@@ -20,6 +20,11 @@
+ 
+ set -e
+ 
++if [ -n "$SKIP_TEST_VIRT_FORMAT_SH" ]; then
++    echo "$0: test skipped because environment variable is set."
++    exit 77
++fi
++
+ rm -f test1.img
+ 
+ ../fish/guestfish -N bootrootlv exit
+-- 
+1.7.11.4
+
diff --git a/libguestfs.spec b/libguestfs.spec
index a0d9cef..6694bf1 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.19.56
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -46,6 +46,9 @@ Patch3:        0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch
 # Upstream patch to fix wipefs test.
 Patch4:        0001-tests-wipefs-Don-t-try-to-wipe-mounted-filesystem.patch
 
+# Upstream patch to allow skipping the virt-format test.
+Patch5:        0001-format-Allow-virt-format-test-to-be-skipped-by-setti.patch
+
 %if 0%{?rhel} >= 7
 ExclusiveArch: x86_64
 %endif
@@ -699,6 +702,7 @@ autoreconf -i
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 mkdir -p daemon/m4
 
@@ -773,6 +777,9 @@ export SKIP_TEST_BTRFS_DEVICES_SH=1
 export SKIP_TEST_BTRFS_SUBVOLUME_DEFAULT_PL=1
 export SKIP_TEST_CHARSET_FIDELITY=1
 
+# Disable virt-format test (RHBZ#872831).
+export SKIP_TEST_VIRT_FORMAT_SH=1
+
 %if %{runtests}
 %ifnarch %{ix86} # RHBZ#870042
 make check
@@ -1027,6 +1034,10 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
+* Tue Nov 06 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.56-3
+- Add upstream patch to disable virt-format test, and disable
+  it because wipefs utility is broken.
+
 * Sat Nov 03 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.56-2
 - Add upstream patch to fix wipefs test.