summaryrefslogtreecommitdiff
path: root/tests/misc
diff options
context:
space:
mode:
authorJérémy Compostella <jeremy.compostella@gmail.com>2012-03-09 19:21:42 +0100
committerPádraig Brady <P@draigBrady.com>2012-03-10 19:53:06 +0000
commit57c929da8bbc297249dadc560e8e3a569b0d685d (patch)
treef68334475ff3975f3ea179ea92935ef3b00de5ab /tests/misc
parent7480e2db2935663b9c0c4d66418ce2801005792d (diff)
downloadcoreutils-57c929da8bbc297249dadc560e8e3a569b0d685d.tar.xz
dirname: support more than one argument
* src/dirname.c (main): Handle new -z option and manage more than one argument. * doc/coreutils.texi (dirname invocation): Mention it. * NEWS (New features): Mention it. * tests/misc/dirname: Add a two arguments test.
Diffstat (limited to 'tests/misc')
-rwxr-xr-xtests/misc/dirname3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/misc/dirname b/tests/misc/dirname
index 37cf7cf18..002183678 100755
--- a/tests/misc/dirname
+++ b/tests/misc/dirname
@@ -35,8 +35,6 @@ my @Tests =
(
['fail-1', {ERR => "$prog: missing operand\n"
. "Try '$prog --help' for more information.\n"}, {EXIT => '1'}],
- ['fail-2', qw(a b), {ERR => "$prog: extra operand 'b'\n"
- . "Try '$prog --help' for more information.\n"}, {EXIT => '1'}],
['a', qw(d/f), {OUT => 'd'}],
['b', qw(/d/f), {OUT => '/d'}],
@@ -51,6 +49,7 @@ my @Tests =
['k', qw(///a///b), {OUT => '///a'}],
['l', qw(///a//b/), {OUT => '///a'}],
['m', qw(''), {OUT => '.'}],
+ ['n', qw(a/b c/d), {OUT => "a\nc"}],
);
# Append a newline to end of each expected 'OUT' string.