summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnel Husakovic <anel@mariadb.org>2020-10-03 00:44:58 +0200
committerAnel Husakovic <anel@mariadb.org>2020-10-22 12:12:03 +0200
commit7ef7d8a15e9e34391fab2b0dba9275cd2f5b31ec (patch)
tree77a1771e4c531799723b1f4ce22950a37c3978a4
parent43ec9370b328fc9bf82e318bf992953a71925cd3 (diff)
downloadmariadb-git-bb-10.1-anel-MDEV-23679-mtrabort.tar.gz
MDEV-23769: MTR can abort before it prints the test result summarybb-10.1-anel-MDEV-23679-mtrabort
- Patch is solving generating report on warning - Patch is doing cosmetic fix of `current_test` log file which holds the old log value of test `CURRENT TEST:..` in `mark_log()` in case of `unknown option` and as such the logic which is using it's content doesn't output valid log content and doesn't generate valid `$test->{'comment'}` message.
-rwxr-xr-xmysql-test/mysql-test-run.pl8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e76712cc079..18726400101 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1005,6 +1005,13 @@ sub run_worker ($) {
stop_servers(reverse all_servers());
if(check_warnings_post_shutdown($server)) {
# Warnings appeared in log file(s) during final server shutdown.
+ # Make sure first to run statistics
+ my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases, \@opt_skip_test_list);
+ my ($prefix, $fail, $completed, $extra_warnings)=
+ run_test_server($server, $tests, $opt_parallel);
+ mtr_print_line();
+ print_total_times($opt_parallel) if $opt_report_times;
+ mtr_report_stats($prefix, $fail, $completed, $extra_warnings);
exit(1);
}
}
@@ -3971,6 +3978,7 @@ sub run_testcase ($$) {
if (start_servers($tinfo))
{
report_failure_and_restart($tinfo);
+ unlink $path_current_testlog;
return 1;
}
}