summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authormsvensson@shellback.(none) <>2007-08-20 15:12:14 +0200
committermsvensson@shellback.(none) <>2007-08-20 15:12:14 +0200
commitcbecd2007e6264fa90f2ba48723120d856674fbb (patch)
tree254d6b9a0fa8938b9dc6086b820b1dbff5f353a4 /mysql-test/lib
parent76d173fa9df9384c40f4ef368977aeac6381c7b7 (diff)
downloadmariadb-git-cbecd2007e6264fa90f2ba48723120d856674fbb.tar.gz
Make it possible to pass mysql-test-run.pl test cases to run
also on the <suite>.<testname> format
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") )