diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-06-15 03:55:46 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-06-19 14:50:34 +0100 |
| commit | 6fadd46acd5b813b545b58014ddd591ffdb5a41c (patch) | |
| tree | 2b9982ef2fed456428e9a64e9a4270ee88985b00 /tests/misc | |
| parent | a262318f833c0d929da4bbd1c3002f891fa9bfa1 (diff) | |
| download | coreutils-6fadd46acd5b813b545b58014ddd591ffdb5a41c.tar.xz | |
numfmt: handle suffixes consistently with --{from,to}-unit
* src/numfmt.c (unit_to_umax): Support SI (power of 10) suffixes
with the --from-unit and --to-unit options. Treat suffixes like
is done with --from=auto, which for example will change the meaning
of --to-unit=G to that of --to-unit=Gi. The suffix support was
previously undocumented and it's better to avoid the traditional
coreutils suffix handling in numfmt by default.
* doc/coreutils.texi: Document the new behavior. Also fix a typo
mentioning {from,to}=units=.
* tests/misc/numfmt.pl: Adjust accordingly.
* NEWS: Mention the change in behavior.
Diffstat (limited to 'tests/misc')
| -rwxr-xr-x | tests/misc/numfmt.pl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/misc/numfmt.pl b/tests/misc/numfmt.pl index 8af55a471..e8640c0f7 100755 --- a/tests/misc/numfmt.pl +++ b/tests/misc/numfmt.pl @@ -92,8 +92,14 @@ my @Tests = ['unit-6', '--from-unit=54W --from=iec --to=iec 4M', {ERR => "$prog: invalid unit size: '54W'\n"}, {EXIT => '1'}], - # Not fully documented.. "--{from,to}-unit" can accept IEC suffixes - ['unit-7', '--from-unit=2K --to=iec 30', {OUT=>"60K"}], + ['unit-7', '--from-unit=K 30', {OUT=>"30000"}], + ['unit-7.1', '--from-unit=Ki 30', {OUT=>"30720"}], + ['unit-7.2', '--from-unit=i 0', + {ERR => "$prog: invalid unit size: 'i'\n"}, + {EXIT => '1'}], + ['unit-7.3', '--from-unit=1i 0', + {ERR => "$prog: invalid unit size: '1i'\n"}, + {EXIT => '1'}], ['unit-8', '--from-unit=1234567890123456789012345 --to=iec 30', {ERR => "$prog: invalid unit size: '1234567890123456789012345'\n"}, {EXIT => '1'}], |