MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:June 2 2009 8:01am
Subject:bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2801) Bug#45190
View as plain text  
#At file:///home/bm136801/my/abstat-51/

 2801 Bjorn Munch	2009-06-02
      Bug #45190 mtr should report some statistics even if aborting after too many tests fail
      Added calls to mtr_report_stats() also after timeout or too many failures
      modified:
        mysql-test/lib/mtr_report.pm
        mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm	2009-05-28 11:02:03 +0000
+++ b/mysql-test/lib/mtr_report.pm	2009-06-02 08:00:45 +0000
@@ -221,8 +221,8 @@ sub mtr_report_test ($) {
 }
 
 
-sub mtr_report_stats ($) {
-  my $tests= shift;
+sub mtr_report_stats ($;$) {
+  my ($tests, $dont_error)= @_;
 
   # ----------------------------------------------------------------------
   # Find out how we where doing
@@ -374,7 +374,7 @@ sub mtr_report_stats ($) {
 
   if ( $tot_failed != 0 || $found_problems)
   {
-    mtr_error("there were failing test cases");
+    mtr_error("there were failing test cases") unless $dont_error;
   }
 }
 

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-05-29 11:04:02 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-06-02 08:00:45 +0000
@@ -528,6 +528,8 @@ sub run_test_server ($$$) {
 	    elsif ($opt_max_test_fail > 0 and
 		   $num_failed_test >= $opt_max_test_fail) {
 	      $suite_timeout_proc->kill();
+	      push(@$completed, $result);
+	      mtr_report_stats($completed, 1);
 	      mtr_report("Too many tests($num_failed_test) failed!",
 			 "Terminating...");
 	      return undef;
@@ -659,6 +661,7 @@ sub run_test_server ($$$) {
     # ----------------------------------------------------
     if ( ! $suite_timeout_proc->wait_one(0) )
     {
+      mtr_report_stats($completed, 1);
       mtr_report("Test suite timeout! Terminating...");
       return undef;
     }

Thread
bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2801) Bug#45190Bjorn Munch2 Jun