diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-12-16 12:36:39 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-12-19 11:56:20 +0000 |
| commit | 6894816c653adef54f3a85becbf75a865d6d39d6 (patch) | |
| tree | 82bb3126d3c8cfaeebc950bd03a52a4f5e0f056c /tests/fmt | |
| parent | 178f8e79dcd1e0b8bbb3b04da664d05eaae56186 (diff) | |
| download | coreutils-6894816c653adef54f3a85becbf75a865d6d39d6.tar.xz | |
diagnose too-large numbers better
Following on from commit v8.23-82-gaddae94, consistently diagnose
numbers that are too large, so as to distinguish from other errors,
and make the limits obvious.
* gl/modules/xdectoint: A new module implementing xdecto[iu]max(),
which handles the common case of parsing a bounded integer and
exiting with a diagnostic on error.
* gl/lib/xdectoimax.c: The signed variant.
* gl/lib/xdectoint.c: The parameterized implementation.
* gl/lib/xdectoint.h: The interface.
* gl/lib/xdectoumax.c: The unsigned variant.
* bootstrap.conf: Reference the new module.
* cfg.mk (exclude_file_name_regexp--sc_require_config_h_first):
Exclude the parameterized templates.
* src/csplit.c: Output EOVERFLOW or ERANGE errors if appropriate.
* src/fmt.c: Likewise.
* src/fold.c: Likewise.
* src/head.c: Likewise.
* src/ls.c: Likewise.
* src/nl.c: Likewise.
* src/nproc.c: Likewise.
* src/shred.c: Likewise.
* src/shuf.c: Likewise.
* src/stdbuf.c: Likewise.
* src/stty.c: Likewise.
* src/tail.c: Likewise.
* src/truncate.c: Likewise.
* src/split.c: Likewise.
* src/pr.c: Likewise.
* tests/pr/pr-tests.pl: Adjust to avoid matching errno diagnostic.
* tests/fmt/base.pl: Likewise.
* tests/split/l-chunk.sh: Likewise.
* tests/misc/shred-negative.sh: Likewise.
* tests/misc/tail.pl: Likewise. Also remove the redundant
existing ERR_SUBST from test err-6.
* tests/ls/hex-option.sh: Check HEX/OCT options.
* tests/misc/shred-size.sh: Likewise.
* tests/misc/stty-row-col.sh: Likewise.
Diffstat (limited to 'tests/fmt')
| -rwxr-xr-x | tests/fmt/base.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/fmt/base.pl b/tests/fmt/base.pl index c6b978785..8751119f1 100755 --- a/tests/fmt/base.pl +++ b/tests/fmt/base.pl @@ -26,9 +26,11 @@ my @Tests = {IN=> "ça\nçb\n"}, {OUT=>"ça b\n"}], ['wide-1', '-w 32768', - {ERR => "fmt: invalid width: '32768'\n"}, {EXIT => 1}], + {ERR => "fmt: invalid width: '32768'"}, {EXIT => 1}, + {ERR_SUBST => 's/:[^:]*$//'}], ['wide-2', '-w 2147483647', - {ERR => "fmt: invalid width: '2147483647'\n"}, {EXIT => 1}], + {ERR => "fmt: invalid width: '2147483647'"}, {EXIT => 1}, + {ERR_SUBST => 's/:[^:]*$//'}], ['bad-suffix', '-72x', {IN=> ''}, {ERR => "fmt: invalid width: '72x'\n"}, {EXIT => 1}], ['no-file', 'no-such-file', |