diff options
Diffstat (limited to 'mysql-test/lib/mtr_cases.pm')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index fe202279ac7..903b3e48324 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -67,8 +67,8 @@ if (-d '../sql') { @plugin_suitedirs= ('storage/*/mysql-test', 'plugin/*/mysql-test', 'storage/*/*/mysql-test', ); $overlay_regex= '\b(?:storage|plugin|storage[/][^/]*)/(\w+)/mysql-test\b'; } else { - @plugin_suitedirs= ('mysql-test/plugin/*'); - $overlay_regex= '\bmysql-test/plugin/(\w+)\b'; + @plugin_suitedirs= ('mariadb-test/plugin/*'); + $overlay_regex= '\bmariadb-test/plugin/(\w+)\b'; } $plugin_suitedir_regex= $overlay_regex; $plugin_suitedir_regex=~ s/\Q(\w+)\E/\\w+/; @@ -278,8 +278,8 @@ sub load_suite_object { sub suite_for_file($) { my ($file) = @_; return ($2, $1) if $file =~ m@^(.*/$plugin_suitedir_regex/(\w+))/@o; - return ($2, $1) if $file =~ m@^(.*/mysql-test/suite/(\w+))/@; - return ('main', $1) if $file =~ m@^(.*/mysql-test)/@; + return ($2, $1) if $file =~ m@^(.*/(?:mysql|mariadb)-test/suite/(\w+))/@; + return ('main', $1) if $file =~ m@^(.*/(?:mysql|mariadb)-test)/@; mtr_error("Cannot determine suite for $file"); } @@ -387,14 +387,14 @@ sub collect_suite_name($$) else { my @dirs = my_find_dir(dirname($::glob_mysql_test_dir), - ["mysql-test/suite", @plugin_suitedirs ], + ["mariadb-test/suite", "mysql-test/suite", @plugin_suitedirs ], $suitename); # # if $suitename contained wildcards, we'll have many suites and # their overlays here. Let's group them appropriately. # for (@dirs) { - m@^.*/(?:mysql-test/suite|$plugin_suitedir_regex)/(.*)$@o or confess $_; + m@^.*/(?:mariadb-test/suite|mysql-test/suite|$plugin_suitedir_regex)/(.*)$@o or confess $_; push @{$suites{$1}}, $_; } } |