rpms/libguestfs/EL-5 0001-tests-Found-three-more-references-to-the-squashfs.patch, NONE, 1.1 libguestfs.spec, 1.62, 1.63
Richard W.M. Jones
rjones at fedoraproject.org
Wed Aug 19 20:41:21 UTC 2009
Author: rjones
Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19429
Modified Files:
libguestfs.spec
Added Files:
0001-tests-Found-three-more-references-to-the-squashfs.patch
Log Message:
Pull in upstream patch to fix tests.
0001-tests-Found-three-more-references-to-the-squashfs.patch:
perl/t/510-lib-file-arch.t | 4 ++--
regressions/test-cancellation-download-librarycancels.sh | 4 ++--
regressions/test-read_file.sh | 5 ++---
3 files changed, 6 insertions(+), 7 deletions(-)
--- NEW FILE 0001-tests-Found-three-more-references-to-the-squashfs.patch ---
>From 0c92c583d5291e1a3a966b36f107bf48e4bfad93 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Wed, 19 Aug 2009 21:37:56 +0100
Subject: [PATCH] tests: Found three more references to the squashfs, replaced with ISO.
---
perl/t/510-lib-file-arch.t | 4 ++--
.../test-cancellation-download-librarycancels.sh | 4 ++--
regressions/test-read_file.sh | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/perl/t/510-lib-file-arch.t b/perl/t/510-lib-file-arch.t
index c4b9d31..5c70449 100644
--- a/perl/t/510-lib-file-arch.t
+++ b/perl/t/510-lib-file-arch.t
@@ -35,7 +35,7 @@ use Sys::Guestfs::Lib;
my $h = Sys::Guestfs->new ();
ok ($h);
-$h->add_drive_ro ("../images/test.sqsh");
+$h->add_drive_ro ("../images/test.iso");
ok (1);
$h->launch ();
@@ -43,7 +43,7 @@ ok (1);
$h->wait_ready ();
ok (1);
-$h->mount_vfs ("ro", "squashfs", "/dev/sda", "/");
+$h->mount_ro ("/dev/sda", "/");
ok (1);
is (Sys::Guestfs::Lib::file_architecture ($h, "/bin-i586-dynamic"),
diff --git a/regressions/test-cancellation-download-librarycancels.sh b/regressions/test-cancellation-download-librarycancels.sh
index b0d78c9..73c5469 100755
--- a/regressions/test-cancellation-download-librarycancels.sh
+++ b/regressions/test-cancellation-download-librarycancels.sh
@@ -25,10 +25,10 @@ set -e
rm -f test.img
../fish/guestfish <<'EOF'
-add ../images/test.sqsh
+add ../images/test.iso
run
-mount-vfs ro squashfs /dev/sda /
+mount-ro /dev/sda /
# Download a file to /dev/full.
echo "Expect: write: /dev/full: No space left on device"
diff --git a/regressions/test-read_file.sh b/regressions/test-read_file.sh
index 5840da3..3b9c6ef 100755
--- a/regressions/test-read_file.sh
+++ b/regressions/test-read_file.sh
@@ -23,9 +23,9 @@ set -e
rm -f test.out
../fish/guestfish <<'EOF' > test.out
-add-ro ../images/test.sqsh
+add-ro ../images/test.iso
run
-mount-vfs ro squashfs /dev/sda /
+mount-ro /dev/sda /
read-file /helloworld.tar
EOF
--
1.6.2.5
Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- libguestfs.spec 19 Aug 2009 19:11:53 -0000 1.62
+++ libguestfs.spec 19 Aug 2009 20:41:21 -0000 1.63
@@ -5,13 +5,16 @@ Summary: Access and modify virtual m
Name: libguestfs
Epoch: 1
Version: 1.0.68
-Release: 4%{?dist}
+Release: 5%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
Source0: http://libguestfs.org/download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# This patch upstream in 1.0.69.
+Patch0: 0001-tests-Found-three-more-references-to-the-squashfs.patch
+
# Currently fails on PPC because:
# "No Package Found for kernel"
ExclusiveArch: %{ix86} x86_64
@@ -307,6 +310,8 @@ Requires: jpackage-utils
%prep
%setup -q
+%patch0 -p1
+
mkdir -p daemon/m4
@@ -540,6 +545,7 @@ rm -rf $RPM_BUILD_ROOT
- New upstream release 1.0.68.
- BR mkisofs.
- For EPEL only we need e4fsprogs.
+- Pull in upstream patch to fix tests.
* Thu Aug 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.67-1
- New upstream release 1.0.67.
More information about the scm-commits
mailing list