[libguestfs] Add upstream patch to allow btrfs tests to be skipped.
Richard W.M. Jones
rjones at fedoraproject.org
Mon Jan 21 10:22:18 UTC 2013
commit 785639ba12ffe389c94213638992f0d1fc4bba52
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Jan 21 10:21:53 2013 +0000
Add upstream patch to allow btrfs tests to be skipped.
- Skip btrfs tests because btrfs has been broken forever (RHBZ#863978).
...ts-virt-make-fs-Allow-btrfs-to-be-skipped.patch | 28 ++++++++++++++++++++
libguestfs.spec | 12 ++++++++-
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/0001-tests-virt-make-fs-Allow-btrfs-to-be-skipped.patch b/0001-tests-virt-make-fs-Allow-btrfs-to-be-skipped.patch
new file mode 100644
index 0000000..2e76976
--- /dev/null
+++ b/0001-tests-virt-make-fs-Allow-btrfs-to-be-skipped.patch
@@ -0,0 +1,28 @@
+From e18e20793f12745e96cc28eedd85e3118f8e20e7 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Mon, 21 Jan 2013 08:15:54 +0000
+Subject: [PATCH] tests: virt-make-fs: Allow btrfs to be skipped.
+
+---
+ tools/test-virt-make-fs.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/test-virt-make-fs.sh b/tools/test-virt-make-fs.sh
+index 80ee4bb..316d959 100755
+--- a/tools/test-virt-make-fs.sh
++++ b/tools/test-virt-make-fs.sh
+@@ -32,6 +32,11 @@ perl -MSys::Guestfs '-MSys::Guestfs::Lib qw(feature_available)' -e '
+ feature_available ($g, "btrfs") and print "btrfs_available=yes\n";
+ ')
+
++# Allow btrfs to be disabled when btrfs is broken (eg. RHBZ#863978).
++if [ -n "$SKIP_TEST_VIRT_MAKE_FS_BTRFS" ]; then
++ btrfs_available=
++fi
++
+ declare -a choices
+
+ # Return a random element from the array 'choices'.
+--
+1.8.1
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 4315382..173e149 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.21.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -33,6 +33,9 @@ Patch1: ruby-1.9-vendor-not-site.patch
BuildRequires: autoconf, automake, libtool, gettext-devel
%endif
+# Upstream patch to let us skip btrfs testing.
+Patch2: 0001-tests-virt-make-fs-Allow-btrfs-to-be-skipped.patch
+
# Basic build requirements:
BuildRequires: perl(Pod::Simple)
BuildRequires: perl(Pod::Man)
@@ -680,6 +683,8 @@ fi
autoreconf -i
%endif
+%patch2 -p1
+
mkdir -p daemon/m4
# Replace developer-centric README that ships with libguestfs, with
@@ -758,6 +763,7 @@ export SKIP_TEST_MKFS_BTRFS=1
export SKIP_TEST_BTRFS_DEVICES_SH=1
export SKIP_TEST_BTRFS_SUBVOLUME_DEFAULT_PL=1
export SKIP_TEST_CHARSET_FIDELITY=1
+export SKIP_TEST_VIRT_MAKE_FS_BTRFS=1
# Disable virt-format test (RHBZ#872831).
export SKIP_TEST_VIRT_FORMAT_SH=1
@@ -1021,6 +1027,10 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
%changelog
+* Mon Jan 21 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.21.4-3
+- Add upstream patch to allow btrfs tests to be skipped.
+- Skip btrfs tests because btrfs has been broken forever (RHBZ#863978).
+
* Sat Jan 19 2013 Richard W.M. Jones <rjones at redhat.com> - 1:1.21.4-2
- Depend on openjdk instead of java.
More information about the scm-commits
mailing list