Add upstream patch to fix regression test.

This commit is contained in:
Richard W.M. Jones 2011-07-15 22:12:13 +01:00
parent 1abff0202a
commit 28ba20e9d9
2 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,49 @@
From 9f135be96e21d899b36ef2287a6ba8cea9beb4ff Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 15 Jul 2011 22:09:29 +0100
Subject: [PATCH] Fix test-guestfish-escapes regression test to work with
debug/trace enabled.
If debugging or tracing is enabled, extra messages are sent to stderr
which mess with this test. Remove the extra messages before checking
stderr.
This updates commit 617e7f6bafa7de2303c08e1715004aae3141c389.
---
regressions/test-guestfish-escapes.sh | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/regressions/test-guestfish-escapes.sh b/regressions/test-guestfish-escapes.sh
index 6f4f434..3ba37d2 100755
--- a/regressions/test-guestfish-escapes.sh
+++ b/regressions/test-guestfish-escapes.sh
@@ -20,7 +20,7 @@
set -e
-rm -f test.output test.error
+rm -f test.output test.error test.error.old
../fish/guestfish <<'EOF' 2>test.error | od > test.output
echo ""
@@ -47,6 +47,11 @@ echo "\100"
-echo """
EOF
+# Since trace and debug output also goes to stderr, we must
+# remove it before testing.
+mv test.error test.error.old
+grep -v '^libguestfs: ' < test.error.old > test.error
+
if [ "$(cat test.error)" != "\
guestfish: invalid escape sequence in string (starting at offset 0)
guestfish: invalid escape sequence in string (starting at offset 0)
@@ -75,4 +80,4 @@ if [ "$(cat test.output)" != "\
exit 1
fi
-rm -f test.output test.error
+rm -f test.output test.error test.error.old
--
1.7.5.2

View File

@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.11.18 Version: 1.11.18
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
@ -44,6 +44,9 @@ Patch0: libguestfs-1.7.13-no-fuse-test.patch
# See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522 # See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
Patch1: 0001-perl-Don-t-set-CCFLAGS.patch Patch1: 0001-perl-Don-t-set-CCFLAGS.patch
# Upstream patch to fix regression test.
Patch2: 0001-Fix-test-guestfish-escapes-regression-test-to-work-w.patch
# Basic build requirements: # Basic build requirements:
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text BuildRequires: /usr/bin/pod2text
@ -483,6 +486,7 @@ php-%{name} contains PHP bindings for %{name}.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
mkdir -p daemon/m4 mkdir -p daemon/m4
@ -838,6 +842,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Jul 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.18-2
- Add upstream patch to fix regression test.
* Fri Jul 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.18-1 * Fri Jul 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.11.18-1
- New upstream version 1.11.18. - New upstream version 1.11.18.
- Force febootstrap >= 3.7 which contains a fix for latest Rawhide. - Force febootstrap >= 3.7 which contains a fix for latest Rawhide.