Commit b928473b authored by Magnus Svensson's avatar Magnus Svensson

WL#4350 Fix --record and no .result file

parent d3659a3e
......@@ -699,6 +699,12 @@ sub collect_one_test_case {
# should fail by default
$tinfo->{result_file}= $result_file;
}
else {
# No .result file exist
# Remember the path where it should be
# saved in case of --record
$tinfo->{record_file}= $result_file;
}
# ----------------------------------------------------------------------
# Skip some tests but include in list, just mark them as skipped
......
......@@ -2638,12 +2638,14 @@ sub do_before_run_mysqltest($)
my $tinfo= shift;
# Remove old files produced by mysqltest
my $base_file= mtr_match_extension($tinfo->{'result_file'},
my $base_file= mtr_match_extension($tinfo->{result_file},
"result"); # Trim extension
if (defined $base_file ){
unlink("$base_file.reject");
unlink("$base_file.progress");
unlink("$base_file.log");
unlink("$base_file.warnings");
}
if ( $mysql_version_id < 50000 ) {
# Set environment variable NDB_STATUS_OK to 1
......@@ -4332,6 +4334,7 @@ sub start_mysqltest ($) {
if ( $opt_record )
{
mtr_add_arg($args, "--record");
mtr_add_arg($args, "--result-file=%s", $tinfo->{record_file});
}
if ( $opt_client_gdb )
......
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