Commit 0b8d2a92 authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)

Merge 192.168.0.7:mysql/mysql-5.1-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
parents 346e5659 cbecd200
...@@ -53,7 +53,8 @@ sub collect_test_cases ($) { ...@@ -53,7 +53,8 @@ sub collect_test_cases ($) {
my $found= 0; my $found= 0;
foreach my $test ( @$cases ) foreach my $test ( @$cases )
{ {
if ( mtr_match_extension($test->{'name'}, $tname) ) if ( $test->{'name'} eq $tname ||
mtr_match_extension($test->{'name'}, $tname) )
{ {
$found= 1; $found= 1;
} }
...@@ -192,8 +193,9 @@ sub collect_one_suite($$) ...@@ -192,8 +193,9 @@ sub collect_one_suite($$)
if ( @::opt_cases ) if ( @::opt_cases )
{ {
# Collect in specified order, no sort # Collect in specified order, no sort
foreach my $tname ( @::opt_cases ) foreach my $tname2 ( @::opt_cases )
{ {
my $tname= $tname2; # Don't modify @::opt_cases !
my $elem= undef; my $elem= undef;
my $component_id= undef; my $component_id= undef;
...@@ -202,6 +204,9 @@ sub collect_one_suite($$) ...@@ -202,6 +204,9 @@ sub collect_one_suite($$)
$tname = basename($tname); $tname = basename($tname);
# Get rid of suite part
$tname =~ s/^$suite\.//;
# Check if the extenstion has been specified. # Check if the extenstion has been specified.
if ( mtr_match_extension($tname, "test") ) if ( mtr_match_extension($tname, "test") )
......
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