diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rwxr-xr-x | tests/misc/uniq | 137 | ||||
| -rw-r--r-- | tests/uniq/Test.pm | 160 |
4 files changed, 133 insertions, 167 deletions
diff --git a/configure.ac b/configure.ac index 688ade43c..3362230e2 100644 --- a/configure.ac +++ b/configure.ac @@ -354,6 +354,5 @@ AC_CONFIG_FILES( tests/tail/Makefile tests/test/Makefile tests/tr/Makefile - tests/uniq/Makefile ) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am index 2b00c0e09..c22b62edf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,7 +23,7 @@ EXTRA_DIST = \ ## N O T E :: Do not add more names to this list. ## N O T E :: Even these are expected to go away. -SUBDIRS = join pr sort tac tail test tr uniq +SUBDIRS = join pr sort tac tail test tr root_tests = \ chown/basic \ diff --git a/tests/misc/uniq b/tests/misc/uniq index 6587844ce..a9fe7b8bc 100755 --- a/tests/misc/uniq +++ b/tests/misc/uniq @@ -29,6 +29,7 @@ require 5.003; use strict; my $prog = 'uniq'; +my $try = "Try \`$prog --help' for more information.\n"; # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -44,11 +45,137 @@ my $in = " y z\n\xa0 y z\n"; my $schar_exp = $x eq 'x' ? " y z\n" : $in; my @Tests = - ( - ['schar', '-f1', {IN => $in}, {OUT => $schar_exp}, - {ENV => "LC_ALL=$locale"}, - ], - ); +( + ['schar', '-f1', {IN => $in}, {OUT => $schar_exp}, + {ENV => "LC_ALL=$locale"}], + ['1', '', {IN=>''}, {OUT=>''}], + ['2', '', {IN=>"a\na\n"}, {OUT=>"a\n"}], + ['3', '', {IN=>"a\na"}, {OUT=>"a\n"}], + ['4', '', {IN=>"a\nb"}, {OUT=>"a\nb\n"}], + ['5', '', {IN=>"a\na\nb"}, {OUT=>"a\nb\n"}], + ['6', '', {IN=>"b\na\na\n"}, {OUT=>"b\na\n"}], + ['7', '', {IN=>"a\nb\nc\n"}, {OUT=>"a\nb\nc\n"}], + + # Ensure that newlines are not interpreted with -z. + ['2z', '-z', {IN=>"a\na\n"}, {OUT=>"a\na\n\0"}], + ['3z', '-z', {IN=>"a\na"}, {OUT=>"a\na\0"}], + ['4z', '-z', {IN=>"a\nb"}, {OUT=>"a\nb\0"}], + ['5z', '-z', {IN=>"a\na\nb"}, {OUT=>"a\na\nb\0"}], + ['20z', '-dz', {IN=>"a\na\n"}, {OUT=>""}], + + # Make sure that eight bit characters work + ['8', '', {IN=>"ö\nv\n"}, {OUT=>"ö\nv\n"}], + # Test output of -u option; only unique lines + ['9', '-u', {IN=>"a\na\n"}, {OUT=>""}], + ['10', '-u', {IN=>"a\nb\n"}, {OUT=>"a\nb\n"}], + ['11', '-u', {IN=>"a\nb\na\n"}, {OUT=>"a\nb\na\n"}], + ['12', '-u', {IN=>"a\na\n"}, {OUT=>""}], + ['13', '-u', {IN=>"a\na\n"}, {OUT=>""}], + #['5', '-u', "a\na\n", "", 0], + # Test output of -d option; only repeated lines + ['20', '-d', {IN=>"a\na\n"}, {OUT=>"a\n"}], + ['21', '-d', {IN=>"a\nb\n"}, {OUT=>""}], + ['22', '-d', {IN=>"a\nb\na\n"}, {OUT=>""}], + ['23', '-d', {IN=>"a\na\nb\n"}, {OUT=>"a\n"}], + # Check the key options + # If we skip over fields or characters, is the output deterministic? + ['obs30', '-1', {IN=>"a a\nb a\n"}, {OUT=>"a a\n"}], + ['31', qw(-f 1), {IN=>"a a\nb a\n"}, {OUT=>"a a\n"}], + ['32', qw(-f 1), {IN=>"a a\nb b\n"}, {OUT=>"a a\nb b\n"}], + ['33', qw(-f 1), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\nb a c\n"}], + ['34', qw(-f 1), {IN=>"b a\na a\n"}, {OUT=>"b a\n"}], + ['35', qw(-f 2), {IN=>"a a c\nb a c\n"}, {OUT=>"a a c\n"}], + # Skip over characters. + ['obs-plus40', '+1', {IN=>"aaa\naaa\n"}, {OUT=>"aaa\n"}], + ['obs-plus41', '+1', {IN=>"baa\naaa\n"}, {OUT=>"baa\n"}], + ['42', qw(-s 1), {IN=>"aaa\naaa\n"}, {OUT=>"aaa\n"}], + ['43', qw(-s 2), {IN=>"baa\naaa\n"}, {OUT=>"baa\n"}], + ['obs-plus44', qw(+1 --), {IN=>"aaa\naaa\n"}, {OUT=>"aaa\n"}], + ['obs-plus45', qw(+1 --), {IN=>"baa\naaa\n"}, {OUT=>"baa\n"}], + # Skip over fields and characters + ['50', qw(-f 1 -s 1), {IN=>"a aaa\nb ab\n"}, {OUT=>"a aaa\nb ab\n"}], + ['51', qw(-f 1 -s 1), {IN=>"a aaa\nb aaa\n"}, {OUT=>"a aaa\n"}], + ['52', qw(-s 1 -f 1), {IN=>"a aaa\nb ab\n"}, {OUT=>"a aaa\nb ab\n"}], + ['53', qw(-s 1 -f 1), {IN=>"a aaa\nb aaa\n"}, {OUT=>"a aaa\n"}], + # Fixed in 2.0.15 + ['54', qw(-s 4), {IN=>"abc\nabcd\n"}, {OUT=>"abc\n"}], + # Supported in 2.0.15 + ['55', qw(-s 0), {IN=>"abc\nabcd\n"}, {OUT=>"abc\nabcd\n"}], + ['56', qw(-s 0), {IN=>"abc\n"}, {OUT=>"abc\n"}], + ['57', qw(-w 0), {IN=>"abc\nabcd\n"}, {OUT=>"abc\n"}], + # Only account for a number of characters + ['60', qw(-w 1), {IN=>"a a\nb a\n"}, {OUT=>"a a\nb a\n"}], + ['61', qw(-w 3), {IN=>"a a\nb a\n"}, {OUT=>"a a\nb a\n"}], + ['62', qw(-w 1 -f 1), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], + ['63', qw(-f 1 -w 1), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], + # The blank after field one is checked too + ['64', qw(-f 1 -w 4), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\nb a c\n"}], + ['65', qw(-f 1 -w 3), {IN=>"a a a\nb a c\n"}, {OUT=>"a a a\n"}], + # Make sure we don't break if the file contains \0 + ['90', '', {IN=>"a\0a\na\n"}, {OUT=>"a\0a\na\n"}], + # Check fields seperated by tabs and by spaces + ['91', '', {IN=>"a\ta\na a\n"}, {OUT=>"a\ta\na a\n"}], + ['92', qw(-f 1), {IN=>"a\ta\na a\n"}, {OUT=>"a\ta\na a\n"}], + ['93', qw(-f 2), {IN=>"a\ta a\na a a\n"}, {OUT=>"a\ta a\n"}], + ['94', qw(-f 1), {IN=>"a\ta\na\ta\n"}, {OUT=>"a\ta\n"}], + # Check the count option; add tests for other options too + ['101', '-c', {IN=>"a\nb\n"}, {OUT=>" 1 a\n 1 b\n"}], + ['102', '-c', {IN=>"a\na\n"}, {OUT=>" 2 a\n"}], + # Check the local -D (--all-repeated) option + ['110', '-D', {IN=>"a\na\n"}, {OUT=>"a\na\n"}], + ['111', qw(-D -w1), {IN=>"a a\na b\n"}, {OUT=>"a a\na b\n"}], + ['112', qw(-D -c), {IN=>"a a\na b\n"}, {OUT=>""}, {EXIT=>1}, {ERR=> + "$prog: printing all duplicated lines and repeat counts is meaningless\n$try"} + ], + ['113', '--all-repeated=separate', {IN=>"a\na\n"}, {OUT=>"a\na\n"}], + ['114', '--all-repeated=separate', {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"a\na\n\nc\nc\n"}], + ['115', '--all-repeated=separate', {IN=>"a\na\nb\nb\nc\n"}, {OUT=>"a\na\n\nb\nb\n"}], + ['116', '--all-repeated=prepend', {IN=>"a\na\n"}, {OUT=>"\na\na\n"}], + ['117', '--all-repeated=prepend', {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"\na\na\n\nc\nc\n"}], + ['118', '--all-repeated=prepend', {IN=>"a\nb\n"}, {OUT=>""}], + ['119', '--all-repeated=badoption', {IN=>"a\n"}, {OUT=>""}, {EXIT=>1}, + {ERR=>"$prog: invalid argument \`badoption' for \`--all-repeated'\n" + . "Valid arguments are:\n" + . " - \`none'\n" + . " - \`prepend'\n" + . " - \`separate'\n" + . $try}], + # Check that -d and -u suppress all output, as POSIX requires. + ['120', qw(-d -u), {IN=>"a\na\n\b"}, {OUT=>""}], + ['121', qw(-d -u -w340282366920938463463374607431768211456), {IN=>"a\na\n\b"}, {OUT=>""}], + # Check that --zero-terminated is synonymous with -z. + ['122', '--zero-terminated', {IN=>"a\na\nb"}, {OUT=>"a\na\nb\0"}], + ['123', '--zero-terminated', {IN=>"a\0a\0b"}, {OUT=>"a\0b\0"}], +); + +# Set _POSIX2_VERSION=199209 in the environment of each obs-plus* test. +foreach my $t (@Tests) + { + $t->[0] =~ /^obs-plus/ + and push @$t, {ENV=>'_POSIX2_VERSION=199209'}; + } + +my $ignore = <<\EOF1; +########################################################### +# When possible, create a "-z"-testing variant of each test. + +# skip any test whose input or output already contains a NUL byte +$in =~ /\0/ || $exp =~ /\0/ + and next; +# skip any test that uses the -z option +$flags =~ /z/ + and next; +# skip the obsolete-syntax tests +$test_name =~ /^obs-plus/ + and next; + +(my $inz = $in) =~ tr/\n/\0/; +(my $expz = $exp) =~ tr/\n/\0/; +my $t2 = ["$test_name-z", "-z $flags", $inz, $expz, $ret]; +push @new, $t2; +EOF1 + +@Tests = triple_test \@Tests; my $save_temps = $ENV{DEBUG}; my $verbose = $ENV{VERBOSE}; diff --git a/tests/uniq/Test.pm b/tests/uniq/Test.pm deleted file mode 100644 index 679077175..000000000 --- a/tests/uniq/Test.pm +++ /dev/null @@ -1,160 +0,0 @@ -# Test "uniq". - -# Copyright (C) 1998, 1999, 2001-2007 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -package Test; -require 5.002; -use strict; - -$Test::input_via_stdin = 1; - -my @tv = ( -# test flags input expected output expected return code -# -['1', '', '', '', 0], -['2', '', "a\na\n", "a\n", 0], -['3', '', "a\na", "a\n", 0], -['4', '', "a\nb", "a\nb\n", 0], -['5', '', "a\na\nb", "a\nb\n", 0], -['6', '', "b\na\na\n", "b\na\n", 0], -['7', '', "a\nb\nc\n", "a\nb\nc\n", 0], - -# Ensure that newlines are not interpreted with -z. -['2z', '-z', "a\na\n", "a\na\n\0", 0], -['3z', '-z', "a\na", "a\na\0", 0], -['4z', '-z', "a\nb", "a\nb\0", 0], -['5z', '-z', "a\na\nb", "a\na\nb\0", 0], -['20z','-dz', "a\na\n", "", 0], - -# Make sure that eight bit characters work -['8', '', "ö\nv\n", "ö\nv\n", 0], -# Test output of -u option; only unique lines -['9', '-u', "a\na\n", "", 0], -['10', '-u', "a\nb\n", "a\nb\n", 0], -['11', '-u', "a\nb\na\n", "a\nb\na\n", 0], -['12', '-u', "a\na\n", "", 0], -['13', '-u', "a\na\n", "", 0], -#['5', '-u', "a\na\n", "", 0], -# Test output of -d option; only repeated lines -['20', '-d', "a\na\n", "a\n", 0], -['21', '-d', "a\nb\n", "", 0], -['22', '-d', "a\nb\na\n", "", 0], -['23', '-d', "a\na\nb\n", "a\n", 0], -# Check the key options -# If we skip over fields or characters, is the output deterministic? -['obs30', '-1', "a a\nb a\n", "a a\n", 0], -['31', '-f 1',"a a\nb a\n", "a a\n", 0], -['32', '-f 1',"a a\nb b\n", "a a\nb b\n", 0], -['33', '-f 1',"a a a\nb a c\n", "a a a\nb a c\n", 0], -['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. -['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], -['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], -['52', '-s 1 -f 1',"a aaa\nb ab\n", "a aaa\nb ab\n", 0], -['53', '-s 1 -f 1',"a aaa\nb aaa\n", "a aaa\n", 0], -# Fixed in 2.0.15 -['54', '-s 4', "abc\nabcd\n", "abc\n", 0], -# Supported in 2.0.15 -['55', '-s 0', "abc\nabcd\n", "abc\nabcd\n", 0], -['56', '-s 0', "abc\n", "abc\n", 0], -['57', '-w 0', "abc\nabcd\n", "abc\n", 0], -# Only account for a number of characters -['60', '-w 1',"a a\nb a\n", "a a\nb a\n", 0], -['61', '-w 3',"a a\nb a\n", "a a\nb a\n", 0], -['62', '-w 1 -f 1',"a a a\nb a c\n", "a a a\n", 0], -['63', '-f 1 -w 1',"a a a\nb a c\n", "a a a\n", 0], -# The blank after field one is checked too -['64', '-f 1 -w 4',"a a a\nb a c\n", "a a a\nb a c\n", 0], -['65', '-f 1 -w 3',"a a a\nb a c\n", "a a a\n", 0], -# Make sure we don't break if the file contains \0 -['90', '', "a\0a\na\n", "a\0a\na\n", 0], -# Check fields seperated by tabs and by spaces -['91', '', "a\ta\na a\n", "a\ta\na a\n", 0], -['92', '-f 1', "a\ta\na a\n", "a\ta\na a\n", 0], -['93', '-f 2', "a\ta a\na a a\n", "a\ta a\n", 0], -['94', '-f 1', "a\ta\na\ta\n", "a\ta\n", 0], -# Check the count option; add tests for other options too -['101', '-c', "a\nb\n", " 1 a\n 1 b\n", 0], -['102', '-c', "a\na\n", " 2 a\n", 0], -# Check the local -D (--all-repeated) option -['110', '-D', "a\na\n", "a\na\n", 0], -['111', '-D -w1',"a a\na b\n", "a a\na b\n", 0], -['112', '-D -c', "a a\na b\n", "", 1], -['113', '--all-repeated=separate',"a\na\n", "a\na\n", 0], -['114', '--all-repeated=separate',"a\na\nb\nc\nc\n", "a\na\n\nc\nc\n", 0], -['115', '--all-repeated=separate',"a\na\nb\nb\nc\n", "a\na\n\nb\nb\n", 0], -['116', '--all-repeated=prepend', "a\na\n", "\na\na\n", 0], -['117', '--all-repeated=prepend', "a\na\nb\nc\nc\n", "\na\na\n\nc\nc\n", 0], -['118', '--all-repeated=prepend', "a\nb\n", "", 0], -['119', '--all-repeated=badoption', "a\n", "", 1], -# Check that -d and -u suppress all output, as POSIX requires. -['120', '-d -u', "a\na\n\b", "", 0], -['121', '-d -u -w340282366920938463463374607431768211456', - "a\na\n\b", "", 0], -# Check that --zero-terminated is synonymous with -z. -['122', '--zero-terminated', "a\na\nb", "a\na\nb\0", 0], -['123', '--zero-terminated', "a\0a\0b", "a\0b\0", 0], -); - -sub test_vector -{ - my @new; - - my $t; - foreach $t (@tv) - { - my ($test_name, $flags, $in, $exp, $ret) = @$t; - $Test::input_via{$test_name} = {REDIR => 0, PIPE => 0}; - - $test_name =~ /^obs-plus/ - and $Test::env{$test_name} = ['_POSIX2_VERSION=199209']; - - $ret - and $Test::input_via{$test_name} = {REDIR => 0}; - - push @new, $t; - - ########################################################### - # When possible, create a "-z"-testing variant of each test. - - # skip any test whose input or output already contains a NUL byte - $in =~ /\0/ || $exp =~ /\0/ - and next; - # skip any test that uses the -z option - $flags =~ /z/ - and next; - # skip the obsolete-syntax tests - $test_name =~ /^obs-plus/ - and next; - - (my $inz = $in) =~ tr/\n/\0/; - (my $expz = $exp) =~ tr/\n/\0/; - my $t2 = ["$test_name-z", "-z $flags", $inz, $expz, $ret]; - push @new, $t2; - } - - return @new; -} - -1; |