database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Magnus Svensson
2008-09-11 22:05:44 +02:00
parent d3659a3ee6
commit b928473b71
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/lib/mtr_cases.pm
View File

@@ -699,6 +699,12 @@ sub collect_one_test_case {
# should fail by default # should fail by default
$tinfo->{result_file}= $result_file; $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 # Skip some tests but include in list, just mark them as skipped

15
mysql-test/mysql-test-run.pl
View File

@@ -2638,12 +2638,14 @@ sub do_before_run_mysqltest($)
my $tinfo= shift; my $tinfo= shift;
# Remove old files produced by mysqltest # 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 "result"); # Trim extension
unlink("$base_file.reject"); if (defined $base_file ){
unlink("$base_file.progress"); unlink("$base_file.reject");
unlink("$base_file.log"); unlink("$base_file.progress");
unlink("$base_file.warnings"); unlink("$base_file.log");
unlink("$base_file.warnings");
}
if ( $mysql_version_id < 50000 ) { if ( $mysql_version_id < 50000 ) {
# Set environment variable NDB_STATUS_OK to 1 # Set environment variable NDB_STATUS_OK to 1
@@ -4332,6 +4334,7 @@ sub start_mysqltest ($) {
if ( $opt_record ) if ( $opt_record )
{ {
mtr_add_arg($args, "--record"); mtr_add_arg($args, "--record");
mtr_add_arg($args, "--result-file=%s", $tinfo->{record_file});
} }
if ( $opt_client_gdb ) if ( $opt_client_gdb )