summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.(none)>2007-08-20 15:15:44 +0200
committerunknown <msvensson@pilot.(none)>2007-08-20 15:15:44 +0200
commita94b075ae6615b102231e4f8101da5263c3c72bd (patch)
tree6ad4ddcda8bb76cc1fbf0fc92f9ac5a200985806 /mysql-test/lib
parent735b45d1253fb30d29282102b5e1deba2ad87d3d (diff)
parentc2ac1eafed604eadc77943f1d3f4dcf46b4b03a1 (diff)
downloadmariadb-git-a94b075ae6615b102231e4f8101da5263c3c72bd.tar.gz
Merge 192.168.0.7:mysql/mysql-5.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'mysql-test/lib')
-rw-r--r--mysql-test/lib/mtr_cases.pl9
1 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index 2becb7f9865..ba7fcb8ce10 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -53,7 +53,8 @@ sub collect_test_cases ($) {
my $found= 0;
foreach my $test ( @$cases )
{
- if ( mtr_match_extension($test->{'name'}, $tname) )
+ if ( $test->{'name'} eq $tname ||
+ mtr_match_extension($test->{'name'}, $tname) )
{
$found= 1;
}
@@ -192,8 +193,9 @@ sub collect_one_suite($$)
if ( @::opt_cases )
{
# 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 $component_id= undef;
@@ -202,6 +204,9 @@ sub collect_one_suite($$)
$tname = basename($tname);
+ # Get rid of suite part
+ $tname =~ s/^$suite\.//;
+
# Check if the extenstion has been specified.
if ( mtr_match_extension($tname, "test") )