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

BUG 54161: automerged bzr bundle from bug report.

Browse Source
This commit is contained in:
Luis Soares 2010-06-02 13:13:30 +01:00
commit 21634b92e5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -768,11 +768,13 @@ sub collect_one_test_case {
# Check for disabled tests # Check for disabled tests
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
my $marked_as_disabled= 0; 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 # Test was marked as disabled in suites disabled.def file
$marked_as_disabled= 1; $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"; my $disabled_file= "$testdir/$tname.disabled";