database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

upmerge 48240

Browse Source
This commit is contained in:
Bjorn Munch
2009-10-26 15:30:49 +01:00
parent 2f0c4678e5 91a7be405c
commit ef6257042a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,8 +222,8 @@ sub mtr_report_test ($) {
} }
sub mtr_report_stats ($;$) { sub mtr_report_stats ($$;$) {
my ($tests, $dont_error)= @_; my ($prefix, $tests, $dont_error)= @_;
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Find out how we where doing # Find out how we where doing
@ -328,6 +328,9 @@ sub mtr_report_stats ($;$) {
} }
} }
# Print summary line prefix
print "$prefix: ";
# Print a list of testcases that failed # Print a list of testcases that failed
if ( $tot_failed != 0 ) if ( $tot_failed != 0 )
{ {

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

@ -411,7 +411,7 @@ sub main {
$opt_gcov_msg, $opt_gcov_err); $opt_gcov_msg, $opt_gcov_err);
} }
mtr_report_stats($completed); mtr_report_stats("Completed", $completed);
exit(0); exit(0);
} }
@ -533,7 +533,7 @@ sub run_test_server ($$$) {
$num_failed_test >= $opt_max_test_fail) { $num_failed_test >= $opt_max_test_fail) {
$suite_timeout_proc->kill(); $suite_timeout_proc->kill();
push(@$completed, $result); push(@$completed, $result);
mtr_report_stats($completed, 1); mtr_report_stats("Too many failed", $completed, 1);
mtr_report("Too many tests($num_failed_test) failed!", mtr_report("Too many tests($num_failed_test) failed!",
"Terminating..."); "Terminating...");
return undef; return undef;
@ -665,7 +665,7 @@ sub run_test_server ($$$) {
# ---------------------------------------------------- # ----------------------------------------------------
if ( ! $suite_timeout_proc->wait_one(0) ) if ( ! $suite_timeout_proc->wait_one(0) )
{ {
mtr_report_stats($completed, 1); mtr_report_stats("Timeout", $completed, 1);
mtr_report("Test suite timeout! Terminating..."); mtr_report("Test suite timeout! Terminating...");
return undef; return undef;
} }