mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't append thread num to $opt_tmpdir is var/tmp

Browse source 
Remove .err and .result files produced by check-testcase and check-warnings
This commit is contained in:
msvensson@pilot.mysql.com 2008-04-28 15:03:30 +02:00
parent 5d3d99c365
commit a0f393d660
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mysql-test/mysql-test-run.pl
View file

@ -989,7 +989,7 @@ sub command_line_setup {
$opt_tmpdir =~ s,/+$,,; # Remove ending slash if any $opt_tmpdir =~ s,/+$,,; # Remove ending slash if any
# If more than one parallel run, use a subdir of the selected tmpdir # If more than one parallel run, use a subdir of the selected tmpdir
if ($thread_num && $opt_parallel > 1) { if ($thread_num && $opt_parallel > 1 and $opt_tmpdir ne "$opt_vardir/tmp") {
$opt_tmpdir.= "/".$thread_num; $opt_tmpdir.= "/".$thread_num;
} }
@ -2597,12 +2597,20 @@ sub check_testcase($$)
mtr_report("Got $proc"); mtr_report("Got $proc");
if ( delete $started{$proc->pid()} ) { if ( delete $started{$proc->pid()} ) {
my $err_file= $proc->user_data();
my $base_file= mtr_match_extension($err_file, "err"); # Trim extension
unlink("$base_file.result");
# One check testcase process returned # One check testcase process returned
my $res= $proc->exit_status(); my $res= $proc->exit_status();
if ( $res == 0){ if ( $res == 0){
# Check completed without problem # Check completed without problem
# Remove the .err file the check generated
unlink($err_file);
if ( keys(%started) == 0){ if ( keys(%started) == 0){
# All checks completed # All checks completed
return 0; return 0;
@ -2615,7 +2623,7 @@ sub check_testcase($$)
if ( $mode eq "after" and $res == 1 ) if ( $mode eq "after" and $res == 1 )
{ {
# Test failed, grab the report mysqltest has created # Test failed, grab the report mysqltest has created
my $report= mtr_grab_file($proc->user_data()); my $report= mtr_grab_file($err_file);
$tinfo->{check}.= $tinfo->{check}.=
"\nThe check of testcase '$tname' failed, this is the\n". "\nThe check of testcase '$tname' failed, this is the\n".
"diff between before and after:\n"; "diff between before and after:\n";
@ -2627,7 +2635,7 @@ sub check_testcase($$)
} }
elsif ( $res ) elsif ( $res )
{ {
my $report= mtr_grab_file($proc->user_data()); my $report= mtr_grab_file($err_file);
$tinfo->{comment}.= $tinfo->{comment}.=
"Could not execute 'check-testcase' $mode testcase '$tname':\n"; "Could not execute 'check-testcase' $mode testcase '$tname':\n";
$tinfo->{comment}.= $report; $tinfo->{comment}.= $report;
@ -2635,6 +2643,9 @@ sub check_testcase($$)
$result= 2; $result= 2;
} }
# Remove the .err file the check generated
unlink($err_file);
} }
} }
else { else {
@ -3038,12 +3049,13 @@ sub check_warnings ($) {
if ( delete $started{$proc->pid()} ) { if ( delete $started{$proc->pid()} ) {
# One check warning process returned # One check warning process returned
my $res= $proc->exit_status(); my $res= $proc->exit_status();
my $err_file= $proc->user_data();
if ( $res == 0 or $res == 62 ){ if ( $res == 0 or $res == 62 ){
if ( $res == 0 ) { if ( $res == 0 ) {
# Check completed with problem # Check completed with problem
my $report= mtr_grab_file($proc->user_data()); my $report= mtr_grab_file($err_file);
# Log to var/log/warnings file # Log to var/log/warnings file
mtr_tofile("$opt_vardir/log/warnings", mtr_tofile("$opt_vardir/log/warnings",
$tname."\n".$report); $tname."\n".$report);
@ -3056,6 +3068,8 @@ sub check_warnings ($) {
# Test case was ok and called "skip" # Test case was ok and called "skip"
; ;
} }
# Remove the .err file the check generated
unlink($err_file);
if ( keys(%started) == 0){ if ( keys(%started) == 0){
# All checks completed # All checks completed
@ -3066,13 +3080,15 @@ sub check_warnings ($) {
} }
else else
{ {
my $report= mtr_grab_file($proc->user_data()); my $report= mtr_grab_file($err_file);
$tinfo->{comment}.= $tinfo->{comment}.=
"Could not execute 'check-warnings' for testcase '$tname':"; "Could not execute 'check-warnings' for testcase '$tname':";
$tinfo->{comment}.= $report; $tinfo->{comment}.= $report;
$result= 2; $result= 2;
} }
# Remove the .err file the check generated
unlink($err_file);
} }
else { else {
# Unknown process returned, most likley a crash, abort everything # Unknown process returned, most likley a crash, abort everything