I installed this:
2005-04-29 Paul Eggert <[EMAIL PROTECTED]>
* tests/head/Test.pm: Don't set _POSIX2_VERSION; no longer needed.
* tests/misc/split-fail: Likewise.
* tests/pr/Test.pm: Likewise.
* tests/sort/Test.pm: Fix comment to match new behavior of "sort".
* tests/tail/Test.pm (tv): Rename tests from obs to obs-plus
if they use file names starting with +.
(test_vector): Don't set _POSIX2_VERSION if obs but not obs-plus.
* tests/uniq/Test.pm (tv, test_vector): Likewise.
Index: tests/head/Test.pm
===================================================================
RCS file: /fetish/cu/tests/head/Test.pm,v
retrieving revision 1.16
diff -p -u -r1.16 Test.pm
--- tests/head/Test.pm 4 May 2003 14:06:52 -0000 1.16
+++ tests/head/Test.pm 29 Apr 2005 23:46:50 -0000
@@ -2,9 +2,6 @@ package Test;
require 5.002;
use strict;
-# Tell head to accept old-style options like `-1'.
-$Test::env_default = ['_POSIX2_VERSION=199209'];
-
my @tv = (
# test name, options, input, expected output, expected return code
#
Index: tests/misc/split-fail
===================================================================
RCS file: /fetish/cu/tests/misc/split-fail,v
retrieving revision 1.9
diff -p -u -r1.9 split-fail
--- tests/misc/split-fail 21 Feb 2005 07:12:37 -0000 1.9
+++ tests/misc/split-fail 29 Apr 2005 23:46:50 -0000
@@ -31,10 +31,10 @@ split -C 0 in 2> /dev/null && fail=1
split -l 0 in 2> /dev/null && fail=1
# Make sure that the obsolete -N notation still works
-_POSIX2_VERSION=199209 split -1 in 2> /dev/null || fail=1
+split -1 in 2> /dev/null || fail=1
# Then make sure that -0 evokes a failure.
-_POSIX2_VERSION=199209 split -0 in 2> /dev/null && fail=1
+split -0 in 2> /dev/null && fail=1
# Ensure that split --lines=N and --bytes=N work for N=2^32,
# assuming our host supports integers that wide.
@@ -51,7 +51,7 @@ fi
#split --line-bytes=$_4gb 2> /dev/null in && fail=1
# Make sure that a huge obsolete option evokes the right failure.
-env -u _POSIX2_VERSION split -99999999999999999991 2> out && fail=1
+split -99999999999999999991 2> out && fail=1
# On losing systems (x86 Solaris 5.9 c89), we get a message like this:
# split: line count option -9999999999... is too large
Index: tests/pr/Test.pm
===================================================================
RCS file: /fetish/cu/tests/pr/Test.pm,v
retrieving revision 1.20
diff -p -u -r1.20 Test.pm
--- tests/pr/Test.pm 1 Apr 2005 07:40:33 -0000 1.20
+++ tests/pr/Test.pm 29 Apr 2005 23:46:51 -0000
@@ -3,9 +3,6 @@ package Test;
require 5.002;
use strict;
-# Tell pr to accept old-style options like operand-less `-S'.
-$Test::env_default = ['_POSIX2_VERSION=199209'];
-
my @tv = (
# -b option is no longer an official option. But it's still working to
Index: tests/sort/Test.pm
===================================================================
RCS file: /fetish/cu/tests/sort/Test.pm,v
retrieving revision 1.29
diff -p -u -r1.29 Test.pm
--- tests/sort/Test.pm 10 Aug 2004 22:47:14 -0000 1.29
+++ tests/sort/Test.pm 29 Apr 2005 23:46:51 -0000
@@ -3,7 +3,7 @@ package Test;
require 5.002;
use strict;
-# Tell sort to accept old-style options like `-1'.
+# Tell sort to accept old-style options like `+1'.
$Test::env_default = ['_POSIX2_VERSION=199209'];
my @tv = (
Index: tests/tail/Test.pm
===================================================================
RCS file: /fetish/cu/tests/tail/Test.pm,v
retrieving revision 1.15
diff -p -u -r1.15 Test.pm
--- tests/tail/Test.pm 5 Dec 2004 23:01:53 -0000 1.15
+++ tests/tail/Test.pm 29 Apr 2005 23:46:51 -0000
@@ -5,8 +5,8 @@ use strict;
my @tv = (
# test name, options, input, expected output, expected return code
#
-['obs-c1', '+2c', 'abcd', 'bcd', 0],
-['obs-c2', '+8c', 'abcd', '', 0],
+['obs-plus-c1', '+2c', 'abcd', 'bcd', 0],
+['obs-plus-c2', '+8c', 'abcd', '', 0],
['obs-c3', '-1c', 'abcd', 'd', 0],
['obs-c4', '-9c', 'abcd', 'abcd', 0],
['obs-c5', '-12c', 'x' . ('y' x 12) . 'z', ('y' x 11) . 'z', 0],
@@ -15,20 +15,20 @@ my @tv = (
['obs-l1', '-1l', 'x', 'x', 0],
['obs-l2', '-1l', "x\ny\n", "y\n", 0],
['obs-l3', '-1l', "x\ny", "y", 0],
-['obs-l4', '+1l', "x\ny\n", "x\ny\n", 0],
-['obs-l5', '+2l', "x\ny\n", "y\n", 0],
+['obs-plus-l4', '+1l', "x\ny\n", "x\ny\n", 0],
+['obs-plus-l5', '+2l', "x\ny\n", "y\n", 0],
# Same as -l tests, but without the `l'.
['obs-1', '-1', 'x', 'x', 0],
['obs-2', '-1', "x\ny\n", "y\n", 0],
['obs-3', '-1', "x\ny", "y", 0],
-['obs-4', '+1', "x\ny\n", "x\ny\n", 0],
-['obs-5', '+2', "x\ny\n", "y\n", 0],
+['obs-plus-4', '+1', "x\ny\n", "x\ny\n", 0],
+['obs-plus-5', '+2', "x\ny\n", "y\n", 0],
# This is equivalent to +10c
-['obsx-1', '+c', 'x' . ('y' x 10) . 'z', 'yyz', 0],
+['obs-plus-x1', '+c', 'x' . ('y' x 10) . 'z', 'yyz', 0],
# This is equivalent to +10l
-['obsx-2', '+l', "x\n" . ("y\n" x 10) . 'z', "y\ny\nz", 0],
+['obs-plus-x2', '+l', "x\n" . ("y\n" x 10) . 'z', "y\ny\nz", 0],
# With no number, this is like -10l
['obs-l', '-l', "x\n" . ("y\n" x 10) . 'z', ("y\n" x 9) . 'z', 0],
@@ -87,7 +87,7 @@ sub test_vector
{
my ($test_name, $flags, $in, $exp, $ret) = @$t;
- $test_name =~ /^(obs|minus-)/
+ $test_name =~ /^(obs-plus-|minus-)/
and $Test::env{$test_name} = ['_POSIX2_VERSION=199209'];
# If you run the minus* tests with a FILE arg they'd hang.
Index: tests/uniq/Test.pm
===================================================================
RCS file: /fetish/cu/tests/uniq/Test.pm,v
retrieving revision 1.12
diff -p -u -r1.12 Test.pm
--- tests/uniq/Test.pm 10 Aug 2004 22:47:16 -0000 1.12
+++ tests/uniq/Test.pm 29 Apr 2005 23:46:51 -0000
@@ -37,12 +37,12 @@ my @tv = (
['34', '-f 1',"b a\na a\n", "b a\n", 0],
['35', '-f 2',"a a c\nb a c\n", "a a c\n", 0],
# Skip over characters.
-['obs40', '+1', "aaa\naaa\n", "aaa\n", 0],
-['obs41', '+1', "baa\naaa\n", "baa\n", 0],
+['obs-plus40', '+1', "aaa\naaa\n", "aaa\n", 0],
+['obs-plus41', '+1', "baa\naaa\n", "baa\n", 0],
['42', '-s 1',"aaa\naaa\n", "aaa\n", 0],
['43', '-s 2',"baa\naaa\n", "baa\n", 0],
-['obs44', '+1 --', "aaa\naaa\n", "aaa\n", 0],
-['obs45', '+1 --', "baa\naaa\n", "baa\n", 0],
+['obs-plus44', '+1 --', "aaa\naaa\n", "aaa\n", 0],
+['obs-plus45', '+1 --', "baa\naaa\n", "baa\n", 0],
# Skip over fields and characters
['50', '-f 1 -s 1',"a aaa\nb ab\n", "a aaa\nb ab\n", 0],
['51', '-f 1 -s 1',"a aaa\nb aaa\n", "a aaa\n", 0],
@@ -95,7 +95,7 @@ sub test_vector
my ($test_name, $flags, $in, $exp, $ret) = @$t;
$Test::input_via{$test_name} = {REDIR => 0, PIPE => 0};
- $test_name =~ /^obs/
+ $test_name =~ /^obs-plus/
and $Test::env{$test_name} = ['_POSIX2_VERSION=199209'];
}
_______________________________________________
Bug-coreutils mailing list
Bug-coreutils@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-coreutils
