rpms/coreutils/devel coreutils-6.10-configuration.patch, 1.30, 1.31 coreutils.spec, 1.302, 1.303
Ondrej Vasik
ovasik at fedoraproject.org
Fri Jan 29 11:33:06 UTC 2010
Author: ovasik
Update of /cvs/pkgs/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26187
Modified Files:
coreutils-6.10-configuration.patch coreutils.spec
Log Message:
do not fail tests if there are no loopdevices left(#558898)
coreutils-6.10-configuration.patch:
gnulib-tests/gnulib.mk | 32 ++++++++++++++++----------------
tests/Makefile.am | 1 -
tests/cp/cp-a-selinux | 9 ++++++---
tests/test-lib.sh | 4 ++--
tests/touch/no-dereference | 2 ++
5 files changed, 26 insertions(+), 22 deletions(-)
Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- coreutils-6.10-configuration.patch 14 Jan 2010 09:56:42 -0000 1.30
+++ coreutils-6.10-configuration.patch 29 Jan 2010 11:33:06 -0000 1.31
@@ -105,3 +105,25 @@ diff -urNp coreutils-8.4-orig/tests/touc
# Changing time of dangling symlink is okay.
# Skip the test if this fails, but the error text corresponds to
+diff -urNp coreutils-8.4-orig/tests/cp/cp-a-selinux coreutils-8.4/tests/cp/cp-a-selinux
+--- coreutils-8.4-orig/tests/cp/cp-a-selinux 2010-01-03 18:06:20.000000000 +0100
++++ coreutils-8.4/tests/cp/cp-a-selinux 2010-01-29 09:39:43.000000000 +0100
+@@ -48,12 +48,15 @@ ls -Z f | grep $ctx || fail=1
+
+ # Create a file system, then mount it with the context=... option.
+ dd if=/dev/zero of=blob bs=8192 count=200 > /dev/null 2>&1 \
+- || framework_failure
+-mkdir mnt || framework_failure
++ || skip=1
++mkdir mnt || skip=1
+ mkfs -t ext2 -F blob ||
+ skip_test_ "failed to create an ext2 file system"
+
+-mount -oloop,context=$ctx blob mnt || framework_failure
++mount -oloop,context=$ctx blob mnt || skip=1
++test $skip = 1 \
++ && skip_test_ "insufficient mount/ext2 support"
++
+ cd mnt || framework_failure
+
+ echo > f || framework_failure
Index: coreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -p -r1.302 -r1.303
--- coreutils.spec 26 Jan 2010 11:41:52 -0000 1.302
+++ coreutils.spec 29 Jan 2010 11:33:06 -0000 1.303
@@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
Version: 8.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -337,6 +337,10 @@ fi
%{_libdir}/coreutils
%changelog
+* Fri Jan 29 2010 Ondrej Vasik <ovasik at redhat.com> - 8.4-3
+- do not fail tests if there are no loopdevices left
+ (#558898)
+
* Tue Jan 26 2010 Ondrej Vasik <ovasik at redhat.com> - 8.4-2
- who doesn't determine user's message status correctly
(#454261)
More information about the scm-commits
mailing list