Commit 2a8a7395 authored by Luis Soares's avatar Luis Soares

BUG#54161: MTR: disabled.def lists don't work with FQ test names

MTR will ignore fully qualified test name entries in disabled.def 
lists. Therefore, it would still run the test case, even if it is
listed.

This patch fix this by extending the check when marking the test
case as disabled to take into consideration not only the cases that
contain the simple test name but also those that contain fully 
qualified test names.
parent baa8f012
...@@ -768,11 +768,13 @@ sub collect_one_test_case { ...@@ -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";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment