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

BUG 54161: automerged mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source
This commit is contained in:
Luis Soares
2010-06-02 13:16:47 +01:00
parent 6633d23f02 21634b92e5
commit 5e24bb532e
1 changed files with 4 additions and 2 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 # 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";