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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d616a7a3
Commit
d616a7a3
authored
Oct 05, 2010
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
merged 5.0-bugteam into 5.1-bugteam
parents
539291cd
743d916a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_cases.pm
+1
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+10
-2
No files found.
mysql-test/lib/mtr_cases.pm
View file @
d616a7a3
...
@@ -909,7 +909,7 @@ sub collect_one_test_case {
...
@@ -909,7 +909,7 @@ sub collect_one_test_case {
{
{
# Ndb is not supported, skip it
# Ndb is not supported, skip it
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
comment
'}
=
"
No ndbcluster support
";
$tinfo
->
{'
comment
'}
=
"
No ndbcluster support
or ndb tests not enabled
";
return
$tinfo
;
return
$tinfo
;
}
}
elsif
(
$::opt_skip_ndbcluster
)
elsif
(
$::opt_skip_ndbcluster
)
...
...
mysql-test/mysql-test-run.pl
View file @
d616a7a3
...
@@ -262,7 +262,8 @@ sub testcase_timeout ($) {
...
@@ -262,7 +262,8 @@ sub testcase_timeout ($) {
our
$opt_warnings
=
1
;
our
$opt_warnings
=
1
;
our
$opt_skip_ndbcluster
=
0
;
our
$opt_include_ndbcluster
=
0
;
our
$opt_skip_ndbcluster
=
1
;
my
$exe_ndbd
;
my
$exe_ndbd
;
my
$exe_ndb_mgmd
;
my
$exe_ndb_mgmd
;
...
@@ -857,6 +858,7 @@ sub command_line_setup {
...
@@ -857,6 +858,7 @@ sub command_line_setup {
# Control what test suites or cases to run
# Control what test suites or cases to run
'
force
'
=>
\
$opt_force
,
'
force
'
=>
\
$opt_force
,
'
with-ndbcluster-only
'
=>
\&
collect_option
,
'
with-ndbcluster-only
'
=>
\&
collect_option
,
'
include-ndbcluster
'
=>
\
$opt_include_ndbcluster
,
'
skip-ndbcluster|skip-ndb
'
=>
\
$opt_skip_ndbcluster
,
'
skip-ndbcluster|skip-ndb
'
=>
\
$opt_skip_ndbcluster
,
'
suite|suites=s
'
=>
\
$opt_suites
,
'
suite|suites=s
'
=>
\
$opt_suites
,
'
skip-rpl
'
=>
\&
collect_option
,
'
skip-rpl
'
=>
\&
collect_option
,
...
@@ -2387,6 +2389,11 @@ sub vs_config_dirs ($$) {
...
@@ -2387,6 +2389,11 @@ sub vs_config_dirs ($$) {
sub
check_ndbcluster_support
($)
{
sub
check_ndbcluster_support
($)
{
my
$mysqld_variables
=
shift
;
my
$mysqld_variables
=
shift
;
if
(
$opt_include_ndbcluster
)
{
$opt_skip_ndbcluster
=
0
;
}
if
(
$opt_skip_ndbcluster
)
if
(
$opt_skip_ndbcluster
)
{
{
mtr_report
("
- skipping ndbcluster
");
mtr_report
("
- skipping ndbcluster
");
...
@@ -5449,7 +5456,8 @@ Options to control what test suites or cases to run
...
@@ -5449,7 +5456,8 @@ Options to control what test suites or cases to run
force Continue to run the suite after failure
force Continue to run the suite after failure
with-ndbcluster-only Run only tests that include "ndb" in the filename
with-ndbcluster-only Run only tests that include "ndb" in the filename
skip-ndb[cluster] Skip all tests that need cluster
skip-ndb[cluster] Skip all tests that need cluster. Default.
include-ndb[cluster] Enable all tests that need cluster
do-test=PREFIX or REGEX
do-test=PREFIX or REGEX
Run test cases which name are prefixed with PREFIX
Run test cases which name are prefixed with PREFIX
or fulfills REGEX
or fulfills REGEX
...
...
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