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

Disable NDB tests to run by default.

Browse Source
This commit is contained in:
Georgi Kodinov
2010-10-05 11:03:14 +03:00
parent 58a8c4b36e
commit cb49825d10
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -581,7 +581,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 disabled";
return; return;
} }
elsif ( $::opt_skip_ndbcluster ) elsif ( $::opt_skip_ndbcluster )

3
mysql-test/mysql-test-run-shell.sh
View File

@ -292,7 +292,8 @@ EXTRA_MYSQLDUMP_OPT=""
EXTRA_MYSQLSHOW_OPT="" EXTRA_MYSQLSHOW_OPT=""
EXTRA_MYSQLBINLOG_OPT="" EXTRA_MYSQLBINLOG_OPT=""
USE_RUNNING_SERVER=0 USE_RUNNING_SERVER=0
USE_NDBCLUSTER=@USE_NDBCLUSTER@ #USE_NDBCLUSTER=@USE_NDBCLUSTER@
USE_NDBCLUSTER=0
USE_NDBCLUSTER_ONLY=0 USE_NDBCLUSTER_ONLY=0
USE_RUNNING_NDBCLUSTER="" USE_RUNNING_NDBCLUSTER=""
USE_PURIFY="" USE_PURIFY=""

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

@ -276,8 +276,9 @@ our $opt_stress_test_file= "";
our $opt_warnings; our $opt_warnings;
our $opt_skip_ndbcluster= 0; our $opt_skip_ndbcluster= 1;
our $opt_skip_ndbcluster_slave= 0; our $opt_skip_ndbcluster_slave= 1;
our $opt_include_ndbcluster= 0;
our $opt_with_ndbcluster= 0; our $opt_with_ndbcluster= 0;
our $opt_with_ndbcluster_only= 0; our $opt_with_ndbcluster_only= 0;
our $glob_ndbcluster_supported= 0; our $glob_ndbcluster_supported= 0;
@ -537,6 +538,7 @@ sub command_line_setup () {
'force' => \$opt_force, 'force' => \$opt_force,
'with-ndbcluster-only' => \$opt_with_ndbcluster_only, 'with-ndbcluster-only' => \$opt_with_ndbcluster_only,
'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster, 'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster,
'include-ndbcluster' => \$opt_include_ndbcluster,
'skip-ndbcluster-slave|skip-ndb-slave' 'skip-ndbcluster-slave|skip-ndb-slave'
=> \$opt_skip_ndbcluster_slave, => \$opt_skip_ndbcluster_slave,
'ndb-extra-test' => \$opt_ndb_extra_test, 'ndb-extra-test' => \$opt_ndb_extra_test,
@ -2531,6 +2533,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 || $opt_extern) if ($opt_skip_ndbcluster || $opt_extern)
{ {
if (!$opt_extern) if (!$opt_extern)
@ -5189,8 +5196,9 @@ 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.
skip-ndb[cluster]-slave Skip all tests that need a slave cluster skip-ndb[cluster]-slave Skip all tests that need a slave cluster
include-ndb[cluster] Enable all tests that need cluster
ndb-extra Run extra tests from ndb directory ndb-extra Run extra tests from ndb directory
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