diff options
| -rw-r--r-- | mysql-test/lib/mtr_report.pm | 9 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 81304ab58e1..4e66e5a67da 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -91,11 +91,14 @@ sub mtr_report_test_passed ($) { $tinfo->{timer}= $timer_str; } - # Set as passed unless already set - if ( not defined $tinfo->{'result'} ){ - $tinfo->{'result'}= 'MTR_RES_PASSED'; + # Big warning if status already set + if ( $tinfo->{'result'} ){ + mtr_warning("mtr_report_test_passed: Test result", + "already set to '", $tinfo->{'result'}, ","); } + $tinfo->{'result'}= 'MTR_RES_PASSED'; + mtr_report_test($tinfo); } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b9963ce23aa..4aa5030c6f5 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -698,6 +698,12 @@ sub run_worker ($) { if ($line eq 'TESTCASE'){ my $test= My::Test::read_test($server); #$test->print_test(); + + # Clear comment and logfile, to avoid + # reusing them from previous test + delete($test->{'comment'}); + delete($test->{'logfile'}); + run_testcase($test); #$test->{result}= 'MTR_RES_PASSED'; # Send it back, now with results set |