MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:February 17 2010 10:16am
Subject:bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2894) Bug#44054
View as plain text  
#At file:///home/bm136801/my/noreord-51/ based on revid:bjorn.munch@stripped

 2894 Bjorn Munch	2010-02-17
      Bug #44054 MTR2: --no-reorder does not prevent reordering
      Some logic would group by suite always
      Disable this if using --noreorder
      Also fix getting array from collect_one_suite() in this case

    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-11-30 13:13:34 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2010-02-17 10:15:45 +0000
@@ -118,10 +118,16 @@ sub collect_test_cases ($$) {
 		      !(IS_WINDOWS && $::opt_embedded_server) &&
 		      $lib_innodb_plugin);
 
-  foreach my $suite (split(",", $suites))
+  # If not reordering, we also shouldn't group by suites, unless
+  # no test cases were named.
+  # This also effects some logic in the loop following this.
+  if ($reorder or !@$opt_cases)
   {
-    push(@$cases, collect_one_suite($suite, $opt_cases));
-    last if $some_test_found;
+    foreach my $suite (split(",", $suites))
+    {
+      push(@$cases, collect_one_suite($suite, $opt_cases));
+      last if $some_test_found;
+    }
   }
 
   if ( @$opt_cases )
@@ -135,6 +141,7 @@ sub collect_test_cases ($$) {
       my ($sname, $tname, $extension)= split_testname($test_name_spec);
       foreach my $test ( @$cases )
       {
+	last unless $reorder;
 	# test->{name} is always in suite.name format
 	if ( $test->{name} =~ /.*\.$tname/ )
 	{
@@ -144,12 +151,13 @@ sub collect_test_cases ($$) {
       }
       if ( not $found )
       {
+	$sname= "main" if !$reorder and !$sname;
 	mtr_error("Could not find '$tname' in '$suites' suite(s)") unless $sname;
-	# If suite was part of name, find it there
-	my ($this_case) = collect_one_suite($sname, [ $tname ]);
-	if ($this_case)
+	# If suite was part of name, find it there, may come with combinations
+	my @this_case = collect_one_suite($sname, [ $tname ]);
+	if (@this_case)
         {
-	  push (@$cases, $this_case);
+	  push (@$cases, @this_case);
 	}
 	else
 	{

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-02-11 13:00:34 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-02-17 10:15:45 +0000
@@ -226,6 +226,7 @@ my $opt_retry_failure= env_or_val(MTR_RE
 my $opt_strace_client;
 
 our $opt_user = "root";
+our $reorder;
 
 my $opt_valgrind= 0;
 my $opt_valgrind_mysqld= 0;
@@ -629,9 +630,9 @@ sub run_test_server ($$$) {
 	    next;
 	  }
 
-	  # Prefer same configuration
-	  if (defined $result and
-	      $result->{template_path} eq $t->{template_path})
+	  # Prefer same configuration, or just use next if --noreorder
+	  if (!$reorder or (defined $result and
+	      $result->{template_path} eq $t->{template_path}))
 	  {
 	    #mtr_report("Test uses same config => good match");
 	    # Test uses same config => good match


Attachment: [text/bzr-bundle] bzr/bjorn.munch@sun.com-20100217101545-cvo3xsj4vivh74mp.bundle
Thread
bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2894) Bug#44054Bjorn Munch17 Feb