Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6f58f368
Commit
6f58f368
authored
Apr 19, 2010
by
Marko =?ISO-8859-1?Q?M=E4kel=E4?=
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable innodb_plugin tests based on the presence of lib_innodb_plugin.
parent
68fcbba6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
7 deletions
+20
-7
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_cases.pm
+20
-7
No files found.
mysql-test/lib/mtr_cases.pm
View file @
6f58f368
...
@@ -74,6 +74,16 @@ my $lib_innodb_plugin;
...
@@ -74,6 +74,16 @@ my $lib_innodb_plugin;
# If "Quick collect", set to 1 once a test to run has been found.
# If "Quick collect", set to 1 once a test to run has been found.
my
$some_test_found
;
my
$some_test_found
;
sub
find_innodb_plugin
{
$lib_innodb_plugin
=
my_find_file
(
$::basedir
,
["
storage/innodb_plugin
",
"
storage/innodb_plugin/.libs
",
"
lib/mysql/plugin
",
"
lib/plugin
"],
["
ha_innodb_plugin.dll
",
"
ha_innodb_plugin.so
",
"
ha_innodb_plugin.sl
"],
NOT_REQUIRED
);
}
sub
init_pattern
{
sub
init_pattern
{
my
(
$from
,
$what
)
=
@_
;
my
(
$from
,
$what
)
=
@_
;
return
undef
unless
defined
$from
;
return
undef
unless
defined
$from
;
...
@@ -106,13 +116,7 @@ sub collect_test_cases ($$$) {
...
@@ -106,13 +116,7 @@ sub collect_test_cases ($$$) {
$do_test_reg
=
init_pattern
(
$do_test
,
"
--do-test
");
$do_test_reg
=
init_pattern
(
$do_test
,
"
--do-test
");
$skip_test_reg
=
init_pattern
(
$skip_test
,
"
--skip-test
");
$skip_test_reg
=
init_pattern
(
$skip_test
,
"
--skip-test
");
$lib_innodb_plugin
=
&
find_innodb_plugin
;
my_find_file
(
$::basedir
,
["
storage/innodb_plugin
",
"
storage/innodb_plugin/.libs
",
"
lib/mysql/plugin
",
"
lib/plugin
"],
["
ha_innodb_plugin.dll
",
"
ha_innodb_plugin.so
",
"
ha_innodb_plugin.sl
"],
NOT_REQUIRED
);
# If not reordering, we also shouldn't group by suites, unless
# If not reordering, we also shouldn't group by suites, unless
# no test cases were named.
# no test cases were named.
...
@@ -940,6 +944,15 @@ sub collect_one_test_case {
...
@@ -940,6 +944,15 @@ sub collect_one_test_case {
}
}
elsif
(
$tinfo
->
{'
innodb_plugin_test
'}
)
elsif
(
$tinfo
->
{'
innodb_plugin_test
'}
)
{
{
# This is a test that needs the innodb plugin
if
(
!&
find_innodb_plugin
)
{
# innodb plugin is not supported, skip it
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
comment
'}
=
"
No innodb plugin support
";
return
$tinfo
;
}
my
$sep
=
(
IS_WINDOWS
)
?
'
;
'
:
'
:
';
my
$sep
=
(
IS_WINDOWS
)
?
'
;
'
:
'
:
';
my
$plugin_filename
=
basename
(
$lib_innodb_plugin
);
my
$plugin_filename
=
basename
(
$lib_innodb_plugin
);
my
$plugin_list
=
my
$plugin_list
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment