diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-23 19:32:14 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-23 19:32:14 +0200 |
| commit | 7b368e3810feda53fc0dbdf5bfe8863f82f0bbcc (patch) | |
| tree | bab573449ec11585c1b5149c7cbf477178caa469 /mysql-test/lib | |
| parent | c8768a091ac2d876216582813aaab7d9663008f7 (diff) | |
| parent | f28e7bd0645d478d33d7ae3b974931c7991cd0bd (diff) | |
| download | mariadb-git-7b368e3810feda53fc0dbdf5bfe8863f82f0bbcc.tar.gz | |
Merge with MySQL 5.1.60
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 4bbe85239f2..e311a9bc3ba 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -225,8 +225,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 |