1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upmerge 12726039

Browse Source
This commit is contained in:
Bjorn Munch 2011-07-28 13:18:52 +02:00
commit 62b6118cfa
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/lib/mtr_cases.pm
View File

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