bzr commit into mysql-5.1-bugteam branch (luis.soares:3398) Bug#54161

[Luis Soares]

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/54161/mysql-5.1-bugteam/ based on revid:jonathan.perkin@stripped

 3398 Luis Soares	2010-06-02
      BUG#54161: MTR: disabled.def lists don't work with FQ test names
      
      MTR will ignore fully qualified test name entries in disabled.def 
      lists. Therefore, it would still run the test case, even if it is
      listed.
      
      This patch fix this by extending the check when marking the test
      case as disabled to take into consideration not only the cases that
      contain the simple test name but also those that contain fully 
      qualified test names.

    modified:
      mysql-test/lib/mtr_cases.pm
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2010-04-19 09:44:05 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2010-06-02 11:20:43 +0000
@@ -768,11 +768,13 @@ sub collect_one_test_case {
   # Check for disabled tests
   # ----------------------------------------------------------------------
   my $marked_as_disabled= 0;
-  if ( $disabled->{$tname} )
+  if ( $disabled->{$tname} or $disabled->{"$suitename.$tname"} )
   {
     # Test was marked as disabled in suites disabled.def file
     $marked_as_disabled= 1;
-    $tinfo->{'comment'}= $disabled->{$tname};
+    # Test name may have been disabled with or without suite name part
+    $tinfo->{'comment'}= $disabled->{$tname} || 
+                         $disabled->{"$suitename.$tname"};
   }
 
   my $disabled_file= "$testdir/$tname.disabled";


Attachment: [text/bzr-bundle] bzr/[e-mail]