database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merged 5.0-bugteam into 5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov
2010-10-05 11:24:45 +03:00
parent 292a72a043 cb49825d10
commit 9d40ad4975
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/mtr_cases.pm
View File

@ -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 )

12
mysql-test/mysql-test-run.pl
View File

@ -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 {
# 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 ($$) {
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
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