summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-10-03 13:41:59 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2011-10-03 13:41:59 +0200
commit968e4363fd2efd4bbb86aefbc84f7398ec54b1f7 (patch)
tree32fd9bc629588bf955718abdac815c689c6e2522 /mysql-test
parentda756ef676100c3257a07394106d6c573ddc0225 (diff)
downloadmariadb-git-968e4363fd2efd4bbb86aefbc84f7398ec54b1f7.tar.gz
backporting 11766169, fixing 13034450
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/lib/mtr_cases.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 3dcd99f235f..9b5608241a3 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -222,8 +222,11 @@ sub collect_test_cases ($$$) {
sub split_testname {
my ($test_name)= @_;
- # Get rid of directory part and split name on .'s
- my @parts= split(/\./, basename($test_name));
+ # If .test file name is used, get rid of directory part
+ $test_name= basename($test_name) if $test_name =~ /\.test$/;
+
+ # Now split name on .'s
+ my @parts= split(/\./, $test_name);
if (@parts == 1){
# Only testname given, ex: alias