diff options
Diffstat (limited to 'tests/misc/sort-merge')
| -rwxr-xr-x | tests/misc/sort-merge | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/misc/sort-merge b/tests/misc/sort-merge index c10a59db2..aedd64c64 100755 --- a/tests/misc/sort-merge +++ b/tests/misc/sort-merge @@ -43,11 +43,11 @@ my @Tests = # check validation of --batch-size option ['nmerge-0', "-m --batch-size=0", @inputs, {ERR=>"$prog: invalid --batch-size argument `0'\n". - "$prog: minimum --batch-size argument is `2'\n"}, {EXIT=>2}], + "$prog: minimum --batch-size argument is `2'\n"}, {EXIT=>2}], ['nmerge-1', "-m --batch-size=1", @inputs, {ERR=>"$prog: invalid --batch-size argument `1'\n". - "$prog: minimum --batch-size argument is `2'\n"}, {EXIT=>2}], + "$prog: minimum --batch-size argument is `2'\n"}, {EXIT=>2}], ['nmerge-neg', "-m --batch-size=-1", @inputs, {ERR=>"$prog: invalid --batch-size argument `-1'\n"}, {EXIT=>2}], @@ -56,9 +56,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) \d+/$1/'}, + {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\n"}, + "$prog: maximum --batch-size argument with current rlimit is\n"}, {EXIT=>2}], # This should work since nmerge >= the number of input files @@ -69,12 +69,12 @@ my @Tests = ['nmerge-no', "-m --batch-size=2 -T$badtmp", @inputs, {ERR_SUBST=>"s|': .*|':|"}, {ERR=>"$prog: cannot create temporary file in `$badtmp':\n"}, - {EXIT=>2}], + {EXIT=>2}], # This used to fail because setting batch-size without also setting # buffer size would cause the buffer size to be set to the minimum. ['batch-size', "--batch-size=16 -T$badtmp", {IN=> {big=> $big_input}}, - {OUT=>$big_input}], + {OUT=>$big_input}], ); my $save_temps = $ENV{DEBUG}; |