MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:August 28 2009 1:03pm
Subject:bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2822) Bug#46973
View as plain text  
#At file:///home/bm136801/my/xtract-51/ based on revid:bjorn.munch@stripped

 2822 Bjorn Munch	2009-08-28
      Bug #46973 MTR: extract_warning_lines does not check it's extracting lines for current test
      Rewrote logic (first commit was incomplete, sorry)

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-08-27 13:17:09 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-08-28 13:02:48 +0000
@@ -3571,8 +3571,8 @@ sub run_testcase ($) {
 # error log and write all lines that look
 # suspicious into $error_log.warnings
 #
-sub extract_warning_lines ($) {
-  my ($error_log) = @_;
+sub extract_warning_lines ($$) {
+  my ($error_log, $tname) = @_;
 
   # Open the servers .err log file and read all lines
   # belonging to current tets into @lines
@@ -3580,14 +3580,27 @@ sub extract_warning_lines ($) {
     or mtr_error("Could not open file '$error_log' for reading: $!");
 
   my @lines;
+  my $found_test= 0;		# Set once we've found the log of this test
   while ( my $line = <$Ferr> )
   {
-    if ( $line =~ /^CURRENT_TEST:/ )
+    if ($found_test)
     {
-      # Throw away lines from previous tests
-      @lines = ();
+      # If test wasn't last after all, discard what we found, test again.
+      if ( $line =~ /^CURRENT_TEST:/)
+      {
+	@lines= ();
+	$found_test= $line =~ /^CURRENT_TEST: $tname/;
+      }
+      else
+      {
+	push(@lines, $line);
+      }
+    }
+    else
+    {
+      # Search for beginning of test, until found
+      $found_test= 1 if ($line =~ /^CURRENT_TEST: $tname/);
     }
-    push(@lines, $line);
   }
   $Ferr = undef; # Close error log file
 
@@ -3665,7 +3678,7 @@ sub start_check_warnings ($$) {
   my $log_error= $mysqld->value('#log-error');
   # To be communicated to the test
   $ENV{MTR_LOG_ERROR}= $log_error;
-  extract_warning_lines($log_error);
+  extract_warning_lines($log_error, $tinfo->{name});
 
   my $args;
   mtr_init_args(\$args);


Attachment: [text/bzr-bundle] bzr/bjorn.munch@sun.com-20090828130248-xnwxfok8naxe5umw.bundle
Thread
bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2822) Bug#46973Bjorn Munch28 Aug