database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge from trunk

Browse Source
This commit is contained in:
Bjorn Munch
2010-06-17 12:27:50 +02:00
parent 36beb9be1d c388c044e0
commit f35fbc4d93
865 changed files with 34864 additions and 36089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -769,11 +769,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";