[libguestfs] Skip LVM test which is failing.

[Richard W.M. Jones]

commit 20aa3ebfaec5a3a40c2e341281eb0e859a343340
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Jul 25 10:09:23 2014 +0100

    Skip LVM test which is failing.

 0001-tests-lvm-Allow-test-to-be-skipped.patch |   28 +++++++++++++++++++++++++
 libguestfs.spec                               |   13 ++++++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/0001-tests-lvm-Allow-test-to-be-skipped.patch b/0001-tests-lvm-Allow-test-to-be-skipped.patch
new file mode 100644
index 0000000..ac201d9
--- /dev/null
+++ b/0001-tests-lvm-Allow-test-to-be-skipped.patch
@@ -0,0 +1,28 @@
+From 64498034bbc7bce2692597fb8bfbb721e8180543 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Fri, 25 Jul 2014 10:04:44 +0100
+Subject: [PATCH] tests: lvm: Allow test to be skipped.
+
+---
+ tests/lvm/test-lvm-filtering.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/lvm/test-lvm-filtering.sh b/tests/lvm/test-lvm-filtering.sh
+index a448554..3744021 100755
+--- a/tests/lvm/test-lvm-filtering.sh
++++ b/tests/lvm/test-lvm-filtering.sh
+@@ -20,6 +20,11 @@
+ 
+ set -e
+ 
++if [ -n "$SKIP_TEST_LVM_FILTERING_SH" ]; then
++    echo "$0: skipping test because environment variable is set."
++    exit 77
++fi
++
+ rm -f test-lvm-filtering-1.img test-lvm-filtering-2.img
+ 
+ actual=$(../../fish/guestfish <<'EOF'
+-- 
+1.9.0
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 71846bc..17c783f 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -23,13 +23,16 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.27.23
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 
 # Source and patches.
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.27-development/%{name}-%{version}.tar.gz
 
+# Upstream in 1.27.24.
+Patch1:        0001-tests-lvm-Allow-test-to-be-skipped.patch
+
 # Basic build requirements:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -720,6 +723,8 @@ if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
     chcon --reference=/tmp tmp
 fi
 
+%patch1 -p1
+
 mkdir -p daemon/m4
 
 # Replace developer-centric README that ships with libguestfs, with
@@ -819,6 +824,9 @@ export SKIP_TEST_NBD_PL=1
 export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
 export SKIP_TEST_VIRT_DF_GUESTS_SH=1
 
+# LVM filter broken in Rawhide, but only on Koji (RHBZ#1123281).
+export SKIP_TEST_LVM_FILTERING_SH=1
+
 # Skip gnulib tests which fail (probably these are kernel/glibc bugs).
 pushd gnulib/tests
 make -k check ||:
@@ -1221,6 +1229,9 @@ popd
 
 
 %changelog
+* Fri Jul 25 2014 Richard W.M. Jones <rjones at redhat.com> - 1:1.27.23-3
+- Skip LVM test which is failing.
+
 * Thu Jul 24 2014 Richard W.M. Jones <rjones at redhat.com> - 1:1.27.23-2
 - Enable tests on aarch64, in order to study which tests fail.