CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-21 11:16:16 +02:00
Code Issues Projects Releases Wiki Activity

tests: fix error message check on some systems

Browse Source 
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.
This commit is contained in:
Pádraig Brady
2014-12-25 02:21:11 +00:00
parent 6894816c65
commit 3b7c9d1a31
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/misc/tail.pl
View File

@@ -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],