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

merge from 5.1

Browse Source
This commit is contained in:
Bjorn Munch
2010-08-04 12:19:51 +02:00
parent 0792d2b069 619a19fe52
commit 992f49c0c4
286 changed files with 12154 additions and 2403 deletions
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
# ----------------------------------------------------------------------
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";