diff options
author | Bo Borgerson <gigabo@gmail.com> | 2008-04-04 11:13:13 -0400 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-06-08 12:11:47 +0200 |
commit | 6eec737ade63bd48e0cccd66c021dd5523100f06 (patch) | |
tree | 654d2b69b59db68fd6679fdfc66fc8d86dccc7be /tests | |
parent | 68158e6b1025292c9cc540ffeebe560a0772d255 (diff) | |
download | coreutils-6eec737ade63bd48e0cccd66c021dd5523100f06.tar.xz |
standardize some error messages
* maint.mk: (sc_error_message_warn_fatal, sc_error_message_uppercase):
(sc_error_message_period): Add automatic checks for non-standard error
messages.
* .x-sc_error_message_uppercase: explicit exclusion for this check
* src/cp.c: Standardize some error messages.
* src/date.c: Likewise.
* src/dircolors.c: Likewise.
* src/du.c: Likewise.
* src/expr.c: Likewise.
* src/install.c: Likewise.
* src/join.c: Likewise.
* src/ln.c: Likewise.
* src/mv.c: Likewise.
* src/od.c: Likewise.
* src/pr.c: Likewise.
* src/split.c: Likewise.
* src/truncate.c: Likewise.
* src/wc.c: Likewise.
* tests/du/files0-from: Expect new error message.
* tests/misc/join: Likewise.
* tests/misc/split-a: Likewise.
* tests/misc/wc-files0-from: Likewise.
* tests/misc/xstrtol: Likewise.
* lib/xmemxfrm.c: Likewise.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/du/files0-from | 2 | ||||
-rwxr-xr-x | tests/misc/join | 2 | ||||
-rwxr-xr-x | tests/misc/split-a | 2 | ||||
-rwxr-xr-x | tests/misc/wc-files0-from | 4 | ||||
-rwxr-xr-x | tests/misc/xstrtol | 3 |
5 files changed, 6 insertions, 7 deletions
diff --git a/tests/du/files0-from b/tests/du/files0-from index 3e299f34e..5cdbd8960 100755 --- a/tests/du/files0-from +++ b/tests/du/files0-from @@ -31,7 +31,7 @@ my @Tests = # invalid extra command line argument ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1}, {ERR => "$prog: extra operand `no-such'\n" - . "File operands cannot be combined with --files0-from.\n" + . "file operands cannot be combined with --files0-from\n" . "Try `$prog --help' for more information.\n"} ], diff --git a/tests/misc/join b/tests/misc/join index 772c2c4ad..4c36c32a5 100755 --- a/tests/misc/join +++ b/tests/misc/join @@ -166,7 +166,7 @@ my @tv = ( # With check, both inputs out of order (in fact, in reverse order) ['chkodr-5', '--check-order', [" b 1\n a 2\n", " b Y\n a Z\n"], "", 1, - "$prog: File 1 is not in sorted order\n"], + "$prog: file 1 is not in sorted order\n"], # Without order check, both inputs out of order and some lines # unpairable. This is NOT supported by the GNU extension. All that diff --git a/tests/misc/split-a b/tests/misc/split-a index b39009942..19f3f0aed 100755 --- a/tests/misc/split-a +++ b/tests/misc/split-a @@ -38,7 +38,7 @@ for f in $files; do printf 'creating file `%s'\''\n' $f done > exp || framework_failure -echo split: Output file suffixes exhausted \ +echo split: output file suffixes exhausted \ > exp-too-short || framework_failure fail=0 diff --git a/tests/misc/wc-files0-from b/tests/misc/wc-files0-from index 505014301..c8ce7d6e5 100755 --- a/tests/misc/wc-files0-from +++ b/tests/misc/wc-files0-from @@ -31,8 +31,8 @@ my @Tests = # invalid extra command line argument ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1}, {ERR => "$prog: extra operand `no-such'\n" - . "File operands cannot be combined with --files0-from.\n" - . "Try `$prog --help' for more information.\n"} + . "file operands cannot be combined with --files0-from\n" + . "Try `$prog --help' for more information.\n"} ], # missing input file diff --git a/tests/misc/xstrtol b/tests/misc/xstrtol index 0ebd32bdc..08f9d1d86 100755 --- a/tests/misc/xstrtol +++ b/tests/misc/xstrtol @@ -38,9 +38,8 @@ my @Tests = ['simply-inval', "--pages=x", {EXIT => 1}, {ERR=>"$prog: invalid --pages argument `x'\n"}], - # FIXME: should be lower case "invalid". ['inv-pg-range', "--pages=9x", {EXIT => 1}, - {ERR=>"$prog: Invalid page range `9x'\n"}], + {ERR=>"$prog: invalid page range `9x'\n"}], ); my $save_temps = $ENV{DEBUG}; |