upmerge 12726039

mysql-test/lib/mtr_cases.pm

@@ -338,7 +338,30 @@ sub collect_one_suite($)
     {
       if ( open(DISABLED, $skip ) )
 	{
+	  # $^O on Windows considered not generic enough
+	  my $plat= (IS_WINDOWS) ? 'windows' : $^O;
+
 	  while ( <DISABLED> )
+	    {
+	      chomp;
+	      #diasble the test case if platform matches
+	      if ( /\@/ )
+		{
+		  if ( /\@$plat/ )
+		    {
+		      /^\s*(\S+)\s*\@$plat.*:\s*(.*?)\s*$/ ;
+		      $disabled{$1}= $2 if not exists $disabled{$1};
+		    }
+		  elsif ( /\@!(\S*)/ )
+		    {
+		      if ( $1 ne $plat)
+			{
+			  /^\s*(\S+)\s*\@!.*:\s*(.*?)\s*$/ ;
+			  $disabled{$1}= $2 if not exists $disabled{$1};
+			}
+		    }
+		}
+	      elsif ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )
 		{
 		  chomp;
 		  if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )
@@ -346,6 +369,7 @@ sub collect_one_suite($)
 		      $disabled{$1}= $2 if not exists $disabled{$1};
 		    }
 		}
+	    }
 	  close DISABLED;
 	}
     }