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
ced63539
Commit
ced63539
authored
Aug 24, 2010
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow suite.pm to tell mtr to skip the suite
parent
8da7be63
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
mysql-test/README.suites
mysql-test/README.suites
+2
-0
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_cases.pm
+7
-0
mysql-test/suite/innodb_plugin/suite.pm
mysql-test/suite/innodb_plugin/suite.pm
+3
-1
No files found.
mysql-test/README.suites
View file @
ced63539
...
...
@@ -31,6 +31,8 @@ package that inherits from My::Suite.
The
suite
.
pm
needs
to
have
@
ISA
=
qw
(
My
::
Suite
)
and
it
must
end
with
bless
{};
-
that
is
it
must
return
an
object
of
that
class
.
It
can
also
return
a
string
-
in
this
case
all
tests
in
the
suite
will
be
skipped
,
with
this
string
being
printed
as
a
reason
.
A
suite
class
can
define
config_files
()
and
servers
()
methods
.
...
...
mysql-test/lib/mtr_cases.pm
View file @
ced63539
...
...
@@ -997,6 +997,13 @@ sub collect_one_test_case {
}
}
if
(
not
ref
$::suites
{
$tinfo
->
{
suite
}})
{
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
comment
'}
=
$::suites
{
$tinfo
->
{
suite
}};
return
$tinfo
;
}
# ----------------------------------------------------------------------
# Append mysqld extra options to master and slave, as appropriate
# ----------------------------------------------------------------------
...
...
mysql-test/suite/innodb_plugin/suite.pm
View file @
ced63539
...
...
@@ -3,12 +3,14 @@ package My::Suite::InnoDB_plugin;
@ISA
=
qw(My::Suite)
;
############# initialization ######################
my
@combinations
=
('
none
')
;
my
@combinations
;
push
@combinations
,
'
innodb_plugin
'
if
$ENV
{
HA_INNODB_PLUGIN_SO
};
push
@combinations
,
'
xtradb_plugin
'
if
$ENV
{
HA_XTRADB_SO
};
push
@combinations
,
'
xtradb
'
if
$::mysqld_variables
{'
innodb
'}
eq
"
ON
";
return
"
Neither innodb_plugin nor xtradb are available
"
unless
@combinations
;
$ENV
{
INNODB_PLUGIN_COMBINATIONS
}
=
join
'
:
',
@combinations
unless
$ENV
{
INNODB_PLUGIN_COMBINATIONS
};
...
...
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