rpms/libguestfs/devel libguestfs-1.0.82-fix-rhbz557655-regression-test.patch, NONE, 1.1 libguestfs.spec, 1.135, 1.136 0001-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch, 1.1, NONE 0002-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch, 1.1, NONE

Fri Jan 29 09:43:13 UTC 2010

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16856

Modified Files:
	libguestfs.spec 
Added Files:
	libguestfs-1.0.82-fix-rhbz557655-regression-test.patch 
Removed Files:
	0001-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch 
	0002-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch 
Log Message:
Combine and tidy up the patches fixing RHBZ557655 test program from upstream.

libguestfs-1.0.82-fix-rhbz557655-regression-test.patch:
 b/regressions/rhbz557655-expected.stderr |   14 ++++++++++++++
 b/regressions/rhbz557655-expected.stdout |    8 ++++++++
 b/regressions/rhbz557655.sh              |   20 +++++++++++++++-----
 regressions/rhbz557655-expected.out      |   22 ----------------------
 4 files changed, 37 insertions(+), 27 deletions(-)

--- NEW FILE libguestfs-1.0.82-fix-rhbz557655-regression-test.patch ---

diff --git a/regressions/rhbz557655-expected.out b/regressions/rhbz557655-expected.out
deleted file mode 100644
index 7d37e84..0000000
--- a/regressions/rhbz557655-expected.out
+++ /dev/null
@@ -1,22 +0,0 @@
-0
-16
-8
--1073741824
-1073741823
-set-memsize: memsize: integer out of range
-set-memsize: memsize: integer out of range
-set-memsize: memsize: integer out of range
-set-memsize: memsize: integer out of range
-set-memsize: memsize: invalid integer parameter (xstrtol returned 4)
-set-memsize: memsize: invalid integer parameter (xstrtol returned 2)
-set-memsize: memsize: invalid integer parameter (xstrtol returned 2)
-set-memsize: memsize: invalid integer parameter (xstrtol returned 2)
-1234
-1234
-1234
-libguestfs: error: truncate_size: ftruncate: /test: File too large
-truncate-size: size: invalid integer parameter (xstrtoll returned 1)
-truncate-size: size: invalid integer parameter (xstrtoll returned 4)
-truncate-size: size: invalid integer parameter (xstrtoll returned 2)
-truncate-size: size: invalid integer parameter (xstrtoll returned 2)
-truncate-size: size: invalid integer parameter (xstrtoll returned 2)
diff --git a/regressions/rhbz557655-expected.stderr b/regressions/rhbz557655-expected.stderr
new file mode 100644
index 0000000..ea560e8
--- /dev/null
+++ b/regressions/rhbz557655-expected.stderr
@@ -0,0 +1,14 @@
+set-memsize: memsize: integer out of range
+set-memsize: memsize: integer out of range
+set-memsize: memsize: integer out of range
+set-memsize: memsize: integer out of range
+set-memsize: memsize: invalid integer parameter (xstrtol returned 4)
+set-memsize: memsize: invalid integer parameter (xstrtol returned 2)
+set-memsize: memsize: invalid integer parameter (xstrtol returned 2)
+set-memsize: memsize: invalid integer parameter (xstrtol returned 2)
+libguestfs: error: truncate_size: ftruncate: /test: File too large
+truncate-size: size: invalid integer parameter (xstrtoll returned 1)
+truncate-size: size: invalid integer parameter (xstrtoll returned 4)
+truncate-size: size: invalid integer parameter (xstrtoll returned 2)
+truncate-size: size: invalid integer parameter (xstrtoll returned 2)
+truncate-size: size: invalid integer parameter (xstrtoll returned 2)
diff --git a/regressions/rhbz557655-expected.stdout b/regressions/rhbz557655-expected.stdout
new file mode 100644
index 0000000..80bc8bc
--- /dev/null
+++ b/regressions/rhbz557655-expected.stdout
@@ -0,0 +1,8 @@
+0
+16
+8
+-1073741824
+1073741823
+1234
+1234
+1234
diff --git a/regressions/rhbz557655.sh b/regressions/rhbz557655.sh
index 6ef0b70..85cfb1e 100755
--- a/regressions/rhbz557655.sh
+++ b/regressions/rhbz557655.sh
@@ -21,10 +21,10 @@
 # "guestfish number parsing should not use atoi, should support '0...' for octal and '0x...' for hexadecimal"
 
 set -e
-rm -f test.out
+rm -f test.out test.err
 export LANG=C
 
-../fish/guestfish >> test.out 2>&1 <<EOF
+../fish/guestfish >> test.out 2>> test.err <<EOF
 # set-memsize is just a convenient non-daemon function that
 # takes a single integer argument.
 set-memsize 0
@@ -49,7 +49,7 @@ get-memsize
 -set-memsize 123L
 EOF
 
-../fish/guestfish >> test.out 2>&1 <<EOF
+../fish/guestfish >> test.out 2>> test.err <<EOF
 alloc test1.img 10M
 run
 part-disk /dev/sda mbr
@@ -79,5 +79,15 @@ filesize /test
 -truncate-size /test 123L
 EOF
 
-diff -u test.out rhbz557655-expected.out
-rm test.out test1.img
+# If we are running with debugging enabled (or even if not), then
+# other messages and warnings can end up in the test.err (stderr) log.
+# Thus filter out only lines we expect.  'proc 200' is the procedure
+# number of truncate_size.
+mv test.err test.err~
+grep -E 'set[-_]memsize|truncate[-_]size' test.err~ |
+  grep -Ev 'proc 200' > test.err
+rm test.err~
+
+diff -u test.out rhbz557655-expected.stdout
+diff -u test.err rhbz557655-expected.stderr
+rm test.out test.err test1.img


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- libguestfs.spec	29 Jan 2010 09:05:30 -0000	1.135
+++ libguestfs.spec	29 Jan 2010 09:43:13 -0000	1.136
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.82
-Release:     4%{?dist}
+Release:     5%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -16,8 +16,7 @@ BuildRoot:   %{_tmppath}/%{name}-%{versi
 Patch0:      libguestfs-1.0.79-no-fuse-test.patch
 
 # Backport RHBZ557655 test fix from upstream.
-Patch1:      0002-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch
-Patch2:      0001-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch
+Patch1:      libguestfs-1.0.82-fix-rhbz557655-regression-test.patch
 
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
@@ -339,7 +338,6 @@ Requires:    jpackage-utils
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -615,7 +613,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jan 29 2010 Richard W.M. Jones <rjones at redhat.com> - 1.0.82-4
+* Fri Jan 29 2010 Richard W.M. Jones <rjones at redhat.com> - 1.0.82-5
 - Backport a better fix for RHBZ557655 test from upstream.
 
 * Thu Jan 28 2010 Richard W.M. Jones <rjones at redhat.com> - 1.0.82-3


--- 0001-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch DELETED ---


--- 0002-Fix-regressions-rhbz557655.sh-when-debugging-is-enab.patch DELETED ---

