workaround libcap issue, move i18n testsuite tuning to i18n, fix gnulib
testsuite failure with multiple skip exit codes
This commit is contained in:
Ondrej Vasik
parent
4de88fbc58
commit
be82102c5b
|
|
@ -1,26 +1,3 @@
|
|||
diff -urN coreutils-6.12-orig/tests/misc/cut coreutils-6.12/tests/misc/cut
|
||||
--- coreutils-6.12-orig/tests/misc/cut 2008-05-17 08:41:11.000000000 +0200
|
||||
+++ coreutils-6.12/tests/misc/cut 2008-06-02 11:13:08.000000000 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
my $prog = 'cut';
|
||||
my $try = "Try \`$prog --help' for more information.\n";
|
||||
my $from_1 = "$prog: fields and positions are numbered from 1\n$try";
|
||||
-my $inval = "$prog: invalid byte or field list\n$try";
|
||||
+my $inval = "$prog: invalid byte, character or field list\n$try";
|
||||
my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try";
|
||||
|
||||
my @Tests =
|
||||
@@ -140,8 +140,8 @@
|
||||
['od-overlap5', '-b1-3,1-4', '--output-d=:', {IN=>"abcde\n"}, {OUT=>"abcd\n"}],
|
||||
|
||||
# None of the following invalid ranges provoked an error up to coreutils-6.9.
|
||||
- ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
|
||||
- {ERR=>"$prog: invalid decreasing range\n$try"}],
|
||||
+ ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
|
||||
+ {ERR=>"$prog: invalid byte, character or field list\n$try"}],
|
||||
['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
|
||||
['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
|
||||
['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
|
||||
diff -urN coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
|
||||
--- coreutils-6.11-orig/tests/mkdir/selinux 2008-04-19 23:34:23.000000000 +0200
|
||||
+++ coreutils-6.11/tests/mkdir/selinux 2008-04-22 13:23:50.000000000 +0200
|
||||
|
|
@ -46,17 +23,65 @@ diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.s
|
|||
skip_test_ "this system (or maybe just" \
|
||||
"the current file system) lacks SELinux support"
|
||||
;;
|
||||
diff -urp coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c coreutils-6.11/gnulib-tests/test-getaddrinfo.c
|
||||
--- coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c
|
||||
+++ coreutils-6.11/gnulib-tests/test-getaddrinfo.c
|
||||
@@ -70,6 +70,10 @@ int simple (char *host, char *service)
|
||||
if (res == EAI_NODATA)
|
||||
return 0;
|
||||
diff -urNp coreutils-7.1-orig/gnulib-tests/test-getaddrinfo.c coreutils-7.1/gnulib-tests/test-getaddrinfo.c
|
||||
--- coreutils-7.1-orig/gnulib-tests/test-getaddrinfo.c 2009-01-27 21:33:19.000000000 +0100
|
||||
+++ coreutils-7.1/gnulib-tests/test-getaddrinfo.c 2009-02-25 13:52:59.000000000 +0100
|
||||
@@ -36,6 +36,8 @@
|
||||
# define dbgprintf if (0) printf
|
||||
#endif
|
||||
|
||||
+ /* Do not fail this test for temporary name resolution errors. */
|
||||
+ if (res == EAI_AGAIN)
|
||||
+ return 0;
|
||||
+static int skip = 0;
|
||||
+
|
||||
return 1;
|
||||
}
|
||||
/* BeOS does not have AF_UNSPEC. */
|
||||
#ifndef AF_UNSPEC
|
||||
# define AF_UNSPEC 0
|
||||
@@ -52,6 +54,9 @@ int simple (char *host, char *service)
|
||||
struct addrinfo *ai0, *ai;
|
||||
int res;
|
||||
|
||||
+ if (skip)
|
||||
+ return 0;
|
||||
+
|
||||
dbgprintf ("Finding %s service %s...\n", host, service);
|
||||
|
||||
/* This initializes "hints" but does not use it. Is there a reason
|
||||
@@ -72,8 +77,12 @@ int simple (char *host, char *service)
|
||||
in-law's farm. */
|
||||
if (res == EAI_AGAIN)
|
||||
{
|
||||
- fprintf (stderr, "skipping getaddrinfo test: no network?\n");
|
||||
- return 77;
|
||||
+ if (!skip)
|
||||
+ {
|
||||
+ skip++;
|
||||
+ fprintf (stderr, "skipping getaddrinfo test: no network?\n");
|
||||
+ return 77;
|
||||
+ }
|
||||
}
|
||||
/* IRIX reports EAI_NONAME for "https". Don't fail the test
|
||||
merely because of this. */
|
||||
diff -urNp coreutils-7.1-orig/src/ls.c coreutils-7.1/src/ls.c
|
||||
--- coreutils-7.1-orig/src/ls.c 2009-02-25 13:23:59.000000000 +0100
|
||||
+++ coreutils-7.1/src/ls.c 2009-02-25 13:25:20.000000000 +0100
|
||||
@@ -38,10 +38,6 @@
|
||||
#include <config.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
-#ifdef HAVE_CAP
|
||||
-# include <sys/capability.h>
|
||||
-#endif
|
||||
-
|
||||
#if HAVE_TERMIOS_H
|
||||
# include <termios.h>
|
||||
#endif
|
||||
@@ -84,6 +80,10 @@
|
||||
#include "system.h"
|
||||
#include <fnmatch.h>
|
||||
|
||||
+#ifdef HAVE_CAP
|
||||
+# include <sys/capability.h>
|
||||
+#endif
|
||||
+
|
||||
#include "acl.h"
|
||||
#include "argmatch.h"
|
||||
#include "dev-ino.h"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,26 @@
|
|||
diff -urN coreutils-6.12-orig/tests/misc/cut coreutils-6.12/tests/misc/cut
|
||||
--- coreutils-6.12-orig/tests/misc/cut 2008-05-17 08:41:11.000000000 +0200
|
||||
+++ coreutils-6.12/tests/misc/cut 2008-06-02 11:13:08.000000000 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
my $prog = 'cut';
|
||||
my $try = "Try \`$prog --help' for more information.\n";
|
||||
my $from_1 = "$prog: fields and positions are numbered from 1\n$try";
|
||||
-my $inval = "$prog: invalid byte or field list\n$try";
|
||||
+my $inval = "$prog: invalid byte, character or field list\n$try";
|
||||
my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try";
|
||||
|
||||
my @Tests =
|
||||
@@ -140,8 +140,8 @@
|
||||
['od-overlap5', '-b1-3,1-4', '--output-d=:', {IN=>"abcde\n"}, {OUT=>"abcd\n"}],
|
||||
|
||||
# None of the following invalid ranges provoked an error up to coreutils-6.9.
|
||||
- ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
|
||||
- {ERR=>"$prog: invalid decreasing range\n$try"}],
|
||||
+ ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
|
||||
+ {ERR=>"$prog: invalid byte, character or field list\n$try"}],
|
||||
['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
|
||||
['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
|
||||
['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
|
||||
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
|
||||
+++ coreutils-6.8+/tests/misc/sort-mb-tests 2007-03-01 15:08:24.000000000 +0000
|
||||
@@ -0,0 +1,58 @@
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: A set of basic GNU tools commonly used in shell scripts
|
||||
Name: coreutils
|
||||
Version: 7.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv3+
|
||||
Group: System Environment/Base
|
||||
Url: http://www.gnu.org/software/coreutils/
|
||||
|
|
@ -309,6 +309,11 @@ fi
|
|||
/sbin/runuser
|
||||
|
||||
%changelog
|
||||
* Wed Feb 25 2009 Ondrej Vasik <ovasik@redhat.com> 7.1-2
|
||||
- workaround libcap issue with broken headers (#483548)
|
||||
- fix gnulib testsuite failure (4x77 (skip) is not
|
||||
77(skip) ;) )
|
||||
|
||||
* Tue Feb 24 2009 Ondrej Vasik <ovasik@redhat.com> - 7.1-1
|
||||
- New upstream release 7.1 (temporarily using tar.gz tarball
|
||||
as there are no xz utils in Fedora), removed applied
|
||||
|
|
|
|||
Loading…
Reference in New Issue