diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-12-25 02:21:11 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-12-25 02:30:05 +0000 |
| commit | 3b7c9d1a31a183b903de9c1396a17b4ee64f09f8 (patch) | |
| tree | f4b4532d1cae9d08fdfd5d52bd38c60981e59c77 /tests/misc/tail.pl | |
| parent | 6894816c653adef54f3a85becbf75a865d6d39d6 (diff) | |
| download | coreutils-3b7c9d1a31a183b903de9c1396a17b4ee64f09f8.tar.xz | |
tests: fix error message check on some systems
http://hydra.nixos.org/build/18129583 identified (on OS X)
an incorrect test assumption in the previous commit.
* gl/lib/xdectoint.c (__xnumtoint): Suppress the EINVAL
error message as it's redundant in this context.
* tests/misc/tail.pl: Suppress _optionally_ appended
strerror messages.
* tests/fmt/base.pl: Likewise.
* tests/pr/pr-tests.pl: Likewise.
* tests/split/l-chunk.sh: Likewise.
Diffstat (limited to 'tests/misc/tail.pl')
| -rwxr-xr-x | tests/misc/tail.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/misc/tail.pl b/tests/misc/tail.pl index adeff6857..f4522446a 100755 --- a/tests/misc/tail.pl +++ b/tests/misc/tail.pl @@ -19,7 +19,7 @@ use strict; my $prog = 'tail'; -my $normalize_strerror = 's/:[^:]*$//'; +my $normalize_strerror = "s/': .*/'/"; # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -59,7 +59,7 @@ my @tv = ( "$prog: cannot open '+cl' for reading: No such file or directory\n"], ['err-2', '-cl', '', '', 1, - "$prog: invalid number of bytes: 'l'\n"], + "$prog: invalid number of bytes: 'l'\n", $normalize_strerror], ['err-3', '+2cz', '', '', 1, "$prog: cannot open '+2cz' for reading: No such file or directory\n"], @@ -72,9 +72,10 @@ my @tv = ( # the diagnostic: 'tail: 99999999999999999999: invalid number of bytes' # on all systems... probably, for now, maybe. ['err-5', '-c99999999999999999999', '', '', 1, - "$prog: invalid number of bytes: '99999999999999999999'", $normalize_strerror], + "$prog: invalid number of bytes: '99999999999999999999'\n", + $normalize_strerror], ['err-6', '-c --', '', '', 1, - "$prog: invalid number of bytes: '-'\n"], + "$prog: invalid number of bytes: '-'\n", $normalize_strerror], # Same as -n 10 ['minus-1', '-', '', '', 0], |