summaryrefslogtreecommitdiff
path: root/tests/misc
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-08-10 10:51:03 +0200
committerJim Meyering <meyering@redhat.com>2008-08-10 16:48:55 +0200
commitcd1f4bc1ecde1e7b313c1d0d587a07965d00d8b1 (patch)
tree098e699c44e71522d8b9554d027c857eec5f1b5b /tests/misc
parentb673a5b8ac32a325bb36a9a5a16747520832a456 (diff)
downloadcoreutils-cd1f4bc1ecde1e7b313c1d0d587a07965d00d8b1.tar.xz
sort: don't print uninitialized in diagnostic
* src/sort.c (specify_nmerge): Do use uinttostr value. Provoke with e.g., sort -m --batch-size=18446744073709551617 Omit quotes around known-numeric value in diagnostic. * tests/misc/sort-merge [nmerge-big]: Tighten ERR_SUBST regexp to require a numeric value in that diagnostic, so this particular failure cannot reappear.
Diffstat (limited to 'tests/misc')
-rwxr-xr-xtests/misc/sort-merge4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/misc/sort-merge b/tests/misc/sort-merge
index fb7c63cc1..985d7a414 100755
--- a/tests/misc/sort-merge
+++ b/tests/misc/sort-merge
@@ -55,9 +55,9 @@ my @Tests =
{ERR=>"$prog: invalid --batch-size argument `a'\n"}, {EXIT=>2}],
['nmerge-big', "-m --batch-size=$bigint", @inputs,
- {ERR_SUBST=>'s/current rlimit is .+\n/current rlimit is/'},
+ {ERR_SUBST=>'s/(current rlimit is) \d+/$1/'},
{ERR=>"$prog: --batch-size argument `$bigint' too large\n".
- "$prog: maximum --batch-size argument with current rlimit is"},
+ "$prog: maximum --batch-size argument with current rlimit is\n"},
{EXIT=>2}],
# This should work since nmerge >= the number of input files