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/pr | |
| 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/pr')
| -rwxr-xr-x | tests/pr/pr-tests.pl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/pr/pr-tests.pl b/tests/pr/pr-tests.pl index cc2ef38c4..04c21e388 100755 --- a/tests/pr/pr-tests.pl +++ b/tests/pr/pr-tests.pl @@ -22,6 +22,7 @@ use strict; @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; my $prog = 'pr'; +my $normalize_strerror = "s/': .*/'/"; my @tv = ( @@ -385,11 +386,9 @@ my @tv = ( ['col-long', '-W3 -t -1 --columns=2', "a\nb\nc\n", "a c\nb\n", 0], # Make sure these fail. ['col-0', '-0', '', '', 1, - "$prog: invalid number of columns: '0'", - 's/:[^:]*$//'], + "$prog: invalid number of columns: '0'\n", $normalize_strerror], ['col-inval', '-'.'9'x100, '', '', 1, - "$prog: invalid number of columns: '". ('9'x100) ."'", - 's/:[^:]*$//'], + "$prog: invalid number of columns: '". ('9'x100) ."'\n", $normalize_strerror], # Before coreutils-5.3.1, --pages=1:-1 would be treated like # --pages=1:18446744073709551615. |