1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WL#4189 mtr.pl v2

Browse Source 
- Clear test variables "comment" and "logfile" to make sure thay aren't
  already set from previous run of same test
 - Print warning if test result already set and set it anyway
This commit is contained in:
Magnus Svensson 2009-01-24 13:02:27 +01:00
parent 0cb63777a7
commit bbdd0576ee
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/lib/mtr_report.pm
View File

@ -91,11 +91,14 @@ sub mtr_report_test_passed ($) {
$tinfo->{timer}= $timer_str; $tinfo->{timer}= $timer_str;
} }
# Set as passed unless already set # Big warning if status already set
if ( not defined $tinfo->{'result'} ){ if ( $tinfo->{'result'} ){
$tinfo->{'result'}= 'MTR_RES_PASSED'; mtr_warning("mtr_report_test_passed: Test result",
"already set to '", $tinfo->{'result'}, ",");
} }
$tinfo->{'result'}= 'MTR_RES_PASSED';
mtr_report_test($tinfo); mtr_report_test($tinfo);
} }

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

@ -698,6 +698,12 @@ sub run_worker ($) {
if ($line eq 'TESTCASE'){ if ($line eq 'TESTCASE'){
my $test= My::Test::read_test($server); my $test= My::Test::read_test($server);
#$test->print_test(); #$test->print_test();
# Clear comment and logfile, to avoid
# reusing them from previous test
delete($test->{'comment'});
delete($test->{'logfile'});
run_testcase($test); run_testcase($test);
#$test->{result}= 'MTR_RES_PASSED'; #$test->{result}= 'MTR_RES_PASSED';
# Send it back, now with results set # Send it back, now with results set