rpms/libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch to disable part of virt-df test.

Browse Source
This commit is contained in:
Richard W.M. Jones 2011-11-11 17:29:42 +00:00
parent 68a1973bdc
commit 3404884051
3 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-df-Disable-part-of-virt-df-test.patch Normal file
View File

@ -0,0 +1,41 @@
From 1c077fba9a690074d9df378afaf3165a06f229c1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 11 Nov 2011 13:30:09 +0000
Subject: [PATCH] df: Disable part of virt-df test.
See:
https://www.redhat.com/archives/libguestfs/2011-November/msg00051.html
---
df/test-virt-df.sh | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/df/test-virt-df.sh b/df/test-virt-df.sh
index 6878327..38884e1 100755
--- a/df/test-virt-df.sh
+++ b/df/test-virt-df.sh
@@ -61,12 +61,14 @@ fi
# /dev/dm-2 31729 395 29696 2% /sysroot/lv2
# /dev/dm-3 63472 144 60052 1% /sysroot/lv3
#
-# Only test plain 'df' output at the moment (XXX).
+# This test is disabled (XXX). See:
+# https://www.redhat.com/archives/libguestfs/2011-November/msg00051.html
-if [ "$(echo "$output" | sort | awk '/VG.LV[123]/ { print $2 " " $3 " " $4 " " $5 }')" != \
-"31728 28 30064 1%
-31729 395 29696 2%
-63472 144 60052 1%" ]; then
- echo "$0: error: output of virt-df did not match expected (df) output"
- exit 1
-fi
+#if [ "$(echo "$output" | sort | awk '/VG.LV[123]/ { print $2 " " $3 " " $4 " " $5 }')" != \
+#"31728 28 30064 1%
+#31729 395 29696 2%
+#63472 144 60052 1%" ]; then
+# echo "$0: error: output of virt-df did not match expected (df) output"
+# echo "$output"
+# exit 1
+#fi
--
1.7.6

23
0001-df-Print-output-of-test-virt-df.sh-on-failure-path.patch
View File

@ -1,23 +0,0 @@
From 39dfb23749cbfd376dd2f2929fb57a999705bad0 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 11 Nov 2011 13:30:09 +0000
Subject: [PATCH] df: Print output of test-virt-df.sh on failure path.
---
df/test-virt-df.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/df/test-virt-df.sh b/df/test-virt-df.sh
index 6878327..e2123a6 100755
--- a/df/test-virt-df.sh
+++ b/df/test-virt-df.sh
@@ -68,5 +68,6 @@ if [ "$(echo "$output" | sort | awk '/VG.LV[123]/ { print $2 " " $3 " " $4 " " $
31729 395 29696 2%
63472 144 60052 1%" ]; then
echo "$0: error: output of virt-df did not match expected (df) output"
+ echo "$output"
exit 1
fi
--
1.7.6

10
libguestfs.spec
View File

@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.15.3
Release: 2%{?dist}
Release: 3%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -232,8 +232,8 @@ Source3: 99-guestfsd.rules
# Replacement README file for Fedora users.
Source4: README-replacement.in
# Upstream patch to print output of virt-df when test fails.
Patch0: 0001-df-Print-output-of-test-virt-df.sh-on-failure-path.patch
# Upstream patch to disable part of virt-df test.
Patch0: 0001-df-Disable-part-of-virt-df-test.patch
%description
@ -962,8 +962,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Nov 11 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.3-2
- Add upstream patch to print output of virt-df when test fails.
* Fri Nov 11 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.3-3
- Add upstream patch to disable part of virt-df test.
* Thu Nov 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.3-1
- New upstream version 1.15.3.