From cd1f4bc1ecde1e7b313c1d0d587a07965d00d8b1 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 10 Aug 2008 10:51:03 +0200 Subject: 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. --- tests/misc/sort-merge | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') 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 -- cgit v1.2.3-70-g09d2