Adjust to new diagnostics.

diff --git a/tests/basename/basic b/tests/basename/basic
index e98e842b9fc3fe84ccdb1234a31b6f8bed5ca6c9..6f022df4cd334c1d9c84fd263ea9abba0bd909eb 100755 (executable)
--- a/tests/basename/basic
+++ b/tests/basename/basic
@@ -24,9 +24,9 @@ my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
 
 my @Tests =
     (
-     ['fail-1', {ERR => "$prog: too few arguments\n"
+     ['fail-1', {ERR => "$prog: missing operand\n"
        . "Try `$prog --help' for more information.\n"}, {EXIT => '1'}],
-     ['fail-2', qw(a a a), {ERR => "$prog: too many arguments\n"
+     ['fail-2', qw(a b c), {ERR => "$prog: extra operand `c'\n"
        . "Try `$prog --help' for more information.\n"}, {EXIT => '1'}],
 
      ['a', qw(d/f),        {OUT => 'f'}],

diff --git a/tests/du/files0-from b/tests/du/files0-from
index 97ae4cd3c84a471de509851a791871e10e06fd98..296e80d0deff20acd0af25c5d88e143cd8292a9e 100755 (executable)
--- a/tests/du/files0-from
+++ b/tests/du/files0-from
@@ -27,8 +27,9 @@ my @Tests =
   (
    # invalid extra command line argument
    ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1},
-    {ERR => "du: no-such: you may not specify command-line arguments "
-     . "with --files0-from\n"}
+    {ERR => "du: extra operand `no-such'\n"
+       . "File operands cannot be combined with --files0-from.\n"
+       . "Try `du --help' for more information.\n"}
     ],
 
    # missing input file

diff --git a/tests/expr/basic b/tests/expr/basic
index b2f1483b611972b908b2378d2c87c20d5743174e..a0cea651cc38dfc2822537e2aacc681c3fe2724f 100755 (executable)
--- a/tests/expr/basic
+++ b/tests/expr/basic
@@ -59,7 +59,7 @@ my @Tests =
 
      ['fail-b', '9 9', {ERR => "$prog: syntax error\n"},
       {EXIT => 2}],
-     ['fail-c', {ERR => "$prog: too few arguments\n"
+     ['fail-c', {ERR => "$prog: missing operand\n"
                 . "Try `$prog --help' for more information.\n"},
       {EXIT => 2}],
     );

diff --git a/tests/mv/diag b/tests/mv/diag
index 125e8658cdb7061570efc64895f895de7c0ece47..c3063793af84b8393cc1da8fae2cf3ca40344538 100755 (executable)
--- a/tests/mv/diag
+++ b/tests/mv/diag
@@ -39,9 +39,9 @@ mv f1 f2 f1 >> out 2>&1 && fail=1
 mv --target=f2 f1 >> out 2>&1 && fail=1
 
 cat > exp <<\EOF
-mv: missing file argument
+mv: missing file operand
 Try `mv --help' for more information.
-mv: missing file argument
+mv: missing file operand after `no-file'
 Try `mv --help' for more information.
 mv: when moving multiple files, last argument must be a directory
 Try `mv --help' for more information.

diff --git a/tests/tsort/basic-1 b/tests/tsort/basic-1
index 0db65b9f2c4269d7deb93acb23e691ca1a80548d..7c914e2861f253e0b376678914642b87e81fbb0f 100755 (executable)
--- a/tests/tsort/basic-1
+++ b/tests/tsort/basic-1
@@ -51,7 +51,7 @@ my @Tests =
 
    ['only-one', {IN => {f => ""}}, {IN => {g => ""}},
     {EXIT => 1},
-    {ERR => "tsort: only one argument may be specified\n"
+    {ERR => "tsort: extra operand `g'\n"
      . "Try `tsort --help' for more information.\n"}],
   );