[libguestfs/el5] Don't run regression tests for 790721.

Tue Jun 26 19:47:16 UTC 2012

commit 776eb934cb6060b14c1bd3b01429a03991bad287
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jun 26 20:47:09 2012 +0100

    Don't run regression tests for 790721.

 ...ble-tracing-in-regression-test-for-bug-79.patch |   31 ---------------
 ...EL-5-Don-t-run-regression-test-for-790721.patch |   40 ++++++++++++++++++++
 README.EPEL-5                                      |   38 +++++++++---------
 libguestfs.spec                                    |    6 +-
 4 files changed, 62 insertions(+), 53 deletions(-)
---

diff --git a/0020-EPEL-5-Don-t-run-regression-test-for-790721.patch b/0020-EPEL-5-Don-t-run-regression-test-for-790721.patch
new file mode 100644
index 0000000..5955dba
--- /dev/null
+++ b/0020-EPEL-5-Don-t-run-regression-test-for-790721.patch
@@ -0,0 +1,40 @@
+From 177209566130b98dc1b256762e761b71c2fdf14a Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones at redhat.com>
+Date: Tue, 26 Jun 2012 20:28:13 +0100
+Subject: [PATCH 20/20] EPEL 5: Don't run regression test for 790721.
+
+Segfaults for reasons not understood.
+---
+ tests/regressions/Makefile.am |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am
+index 3027cd8..8e1976c 100644
+--- a/tests/regressions/Makefile.am
++++ b/tests/regressions/Makefile.am
+@@ -27,12 +27,12 @@ TESTS = \
+ 	rhbz602997.sh \
+ 	rhbz690819.sh \
+ 	rhbz789960.sh \
+-	rhbz790721 \
+ 	rhbz811649.sh \
+ 	test-noexec-stack.pl
+ 
+ tests_not_run = \
+-	rhbz727178.sh
++	rhbz727178.sh \
++	rhbz790721
+ 
+ random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
+ 
+@@ -62,6 +62,6 @@ rhbz790721_LDADD = \
+ 
+ EXTRA_DIST = \
+ 	$(TESTS) \
+-	$(tests_not_run) \
++	rhbz727178.sh \
+ 	rhbz557655-expected.stdout \
+ 	rhbz557655-expected.stderr
+-- 
+1.7.4.1
+
diff --git a/README.EPEL-5 b/README.EPEL-5
index 8cbaa2e..fcd3718 100644
--- a/README.EPEL-5
+++ b/README.EPEL-5
@@ -56,7 +56,7 @@ to file bugs.
 --------------------------
 
 The following features are not compatible with RHEL 5 and have been
-removed completely:
+either removed completely or disabled:
 
  - PHP bindings
 
@@ -77,39 +77,39 @@ removed completely:
 
  - Internationalization of any non-C programs.
 
+ - guestfs_vfs_label cannot read labels from NTFS filesystems.
 
-(4) Features that may not work
-------------------------------
-
-The following features may not work in this version of libguestfs:
+ - guestfs_blkid may return fewer fields than expected on a more modern
+   Linux system.
 
- - LUKS (encrypted filesystems within guests)
+ - guestfs_txz_in and guestfs_txz_out are not implemented.
 
- - MD (RAID devices within guests)
+ - guestfs_utimens doesn't let you set the time on a symbolic link (this
+   is a limitation of the RHEL 5 kernel).
 
- - FUSE, guestmount, the mount-local API.  These appear to have some
-   problems because of the older version of FUSE in RHEL 5.
+ - guestfs_mkswap_label followed by guestfs_swapon_label does not work.
+   The reasons are not well understood.
 
- - virt-sysprep '--script' option (because it requires FUSE).
+ - Adding drives using non-virtio-blk interfaces.
 
  - The 'ntfsclone_*' APIs only partially work.  In particular,
    the 'metadataonly' flag is not working, and maybe other parts
    of this API won't work.
 
- - guestfs_vfs_label cannot read labels from NTFS filesystems.
 
- - guestfs_blkid may return fewer fields than expected on a more modern
-   Linux system.
+(4) Features that may not work
+------------------------------
 
- - guestfs_txz_in and guestfs_txz_out don't work.
+The following features may not work fully in this version of libguestfs:
 
- - guestfs_utimens doesn't let you set the time on a symbolic link (this
-   is a limitation of the RHEL 5 kernel).
+ - LUKS (encrypted filesystems within guests)
 
- - guestfs_mkswap_label followed by guestfs_swapon_label does not work.
-   The reasons are not well understood.
+ - MD (RAID devices within guests)
 
- - Adding drives using non-virtio-blk interfaces.
+ - FUSE, guestmount, the mount-local API.  These appear to have some
+   problems because of the older version of FUSE in RHEL 5.
+
+ - virt-sysprep '--script' option (because it requires FUSE).
 
  - Enabling trace in multi-threaded programs may cause a segfault.
    Appears to be caused by a bug in RHEL 5 glibc open_memstream(3).
diff --git a/libguestfs.spec b/libguestfs.spec
index 7b553f0..6753572 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.19.12
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -60,7 +60,7 @@ Patch0016:     0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
 Patch0017:     0017-EPEL-5-Remove-Fedora-MD-test-images.patch
 Patch0018:     0018-EPEL-5-Add-mkisofs-to-package-list.patch
 Patch0019:     0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
-Patch0020:     0020-EPEL-5-Disable-tracing-in-regression-test-for-bug-79.patch
+Patch0020:     0020-EPEL-5-Don-t-run-regression-test-for-790721.patch
 
 # Patch upstream in libguestfs >= 1.19.13.
 Patch0021:     0021-ocaml-Allow-parallel-mount-local-test-to-be-skipped.patch
@@ -913,7 +913,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Jun 25 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.12-2
+* Tue Jun 25 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.12-3
 - New upstream version 1.19.12.
 - Update patches.
 
