summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBo Borgerson <gigabo@gmail.com>2008-04-03 18:42:57 -0400
committerJim Meyering <meyering@redhat.com>2008-06-17 08:50:41 +0200
commit322c6f2e5cd3d09ed31d9d8dea2310d70f47842a (patch)
treed3c17172c9c56923607451c1e37d7a331b8bfbea /tests
parent3435bb7f4021e7f05fbe317ebec34851effce27c (diff)
downloadcoreutils-322c6f2e5cd3d09ed31d9d8dea2310d70f47842a.tar.xz
sort: add new option --files0-from=F
* src/sort.c: Support new option. * tests/misc/sort-files0-from: Test new option. * tests/misc/Makefile.am: Indicate new test. * docs/coreutils.texi: Explain new option. * NEWS: Advertise new option. Signed-off-by: Bo Borgerson <gigabo@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xtests/misc/sort-files0-from96
2 files changed, 97 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9b6a37819..f7275f88c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -193,6 +193,7 @@ TESTS = \
misc/shuf \
misc/sort \
misc/sort-compress \
+ misc/sort-files0-from \
misc/sort-merge \
misc/sort-rand \
misc/split-a \
diff --git a/tests/misc/sort-files0-from b/tests/misc/sort-files0-from
new file mode 100755
index 000000000..0907320ea
--- /dev/null
+++ b/tests/misc/sort-files0-from
@@ -0,0 +1,96 @@
+#!/usr/bin/perl
+# Exercise sort's --files0-from option.
+# FIXME: keep this file in sync with tests/du/files0-from.
+
+# Copyright (C) 2006-2008 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/>.
+
+use strict;
+
+(my $program_name = $0) =~ s|.*/||;
+
+my $prog = 'sort';
+
+# Turn off localization of executable's output.
+@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+
+my @Tests =
+ (
+ # invalid extra command line argument
+ ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>2},
+ {ERR => "$prog: extra operand `no-such'\n"
+ . "file operands cannot be combined with --files0-from\n"
+ . "Try `$prog --help' for more information.\n"}
+ ],
+
+ # missing input file
+ ['missing', '--files0-from=missing', {EXIT=>2},
+ {ERR => "$prog: cannot open `missing' for reading: "
+ . "No such file or directory\n"}],
+
+ # input file name of '-'
+ ['minus-in-stdin', '--files0-from=-', '<', {IN=>{f=>'-'}}, {EXIT=>2},
+ {ERR => "$prog: when reading file names from stdin, no file name of"
+ . " `-' allowed\n"}],
+
+ # empty input, regular file
+ ['empty', '--files0-from=@AUX@', {AUX=>''}, {EXIT=>2},
+ {ERR_SUBST => 's/no input from.+$//'}, {ERR => "$prog: \n"}],
+
+ # empty input, from non-regular file
+ ['empty-nonreg', '--files0-from=/dev/null', {EXIT=>2},
+ {ERR => "$prog: no input from `/dev/null'\n"}],
+
+ # one NUL
+ ['nul-1', '--files0-from=-', '<', {IN=>"\0"}, {EXIT=>2},
+ {ERR => "$prog: -:1: invalid zero-length file name\n"}],
+
+ # two NULs
+ # Note that the behavior here differs from `wc' in that the
+ # first zero-length file name is treated as fatal, so there
+ # is only one line of diagnostic output.
+ ['nul-2', '--files0-from=-', '<', {IN=>"\0\0"}, {EXIT=>2},
+ {ERR => "$prog: -:1: invalid zero-length file name\n"}],
+
+ # one file name, no NUL
+ ['1', '--files0-from=-', '<',
+ {IN=>{f=>"g"}}, {AUX=>{g=>'a'}}, {OUT=>"a\n"} ],
+
+ # one file name, with NUL
+ ['1a', '--files0-from=-', '<',
+ {IN=>{f=>"g\0"}}, {AUX=>{g=>'a'}}, {OUT=>"a\n"} ],
+
+ # two file names, no final NUL
+ ['2', '--files0-from=-', '<',
+ {IN=>{f=>"g\0g"}}, {AUX=>{g=>'a'}}, {OUT=>"a\na\n"} ],
+
+ # two file names, with final NUL
+ ['2a', '--files0-from=-', '<',
+ {IN=>{f=>"g\0g\0"}}, {AUX=>{g=>'a'}}, {OUT=>"a\na\n"} ],
+
+ # Ensure that $prog performs no processing when there is a zero-length filename
+ # Note that the behavior here differs from `wc' in that the
+ # first zero-length file name is treated as fatal, so there
+ # should be no output on STDOUT.
+ ['zero-len', '--files0-from=-', '<',
+ {IN=>{f=>"\0g\0"}}, {AUX=>{g=>''}},
+ {ERR => "$prog: -:1: invalid zero-length file name\n"}, {EXIT=>2} ],
+ );
+
+my $save_temps = $ENV{DEBUG};
+my $verbose = $ENV{VERBOSE};
+
+my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
+exit $fail;