Commit 6483b845 authored by unknown's avatar unknown

fix for recovery unit test under Unix


storage/maria/unittest/ma_test_recovery.pl:
  Perl magic does something unexpected with $suffix is ""
parent 4a1763e4
...@@ -73,7 +73,7 @@ foreach my $prog (@t) ...@@ -73,7 +73,7 @@ foreach my $prog (@t)
{ {
unlink <maria_log.* maria_log_control>; unlink <maria_log.* maria_log_control>;
my $prog_no_suffix= $prog; my $prog_no_suffix= $prog;
$prog_no_suffix=~ s/$suffix//; $prog_no_suffix=~ s/$suffix// if ($suffix);
print MY_LOG "TEST WITH $prog_no_suffix\n"; print MY_LOG "TEST WITH $prog_no_suffix\n";
$res= `$maria_exe_path/$prog`; $res= `$maria_exe_path/$prog`;
print MY_LOG $res; print MY_LOG $res;
...@@ -149,8 +149,8 @@ foreach my $take_checkpoint (@take_checkpoints) ...@@ -149,8 +149,8 @@ foreach my $take_checkpoint (@take_checkpoints)
$commit_run_args= $t2[$k + 1]; $commit_run_args= $t2[$k + 1];
$abort_run_args= $t2[$k + 2]; $abort_run_args= $t2[$k + 2];
unlink <maria_log.* maria_log_control>; unlink <maria_log.* maria_log_control>;
my $prog_no_suffix= $prog; my $prog_no_suffix= $prog;
$prog_no_suffix=~ s/$suffix//; $prog_no_suffix=~ s/$suffix// if ($suffix);
print MY_LOG "TEST WITH $prog_no_suffix $commit_run_args (commit at end)\n"; print MY_LOG "TEST WITH $prog_no_suffix $commit_run_args (commit at end)\n";
$res= `$maria_exe_path/$prog $commit_run_args`; $res= `$maria_exe_path/$prog $commit_run_args`;
print MY_LOG $res; print MY_LOG $res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment