diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-10-05 11:24:45 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-10-05 11:24:45 +0300 |
| commit | d616a7a31fcc26ae9a7bbfdd4d1429f3e71c2675 (patch) | |
| tree | 91aff17f3848d16a80520e35d0f5ab5372f6f693 /mysql-test/mysql-test-run.pl | |
| parent | 539291cde946cf350d01ac3f1d78349a73d7b833 (diff) | |
| parent | 743d916a51e5d67bcd869a98753b5902648d0338 (diff) | |
| download | mariadb-git-d616a7a31fcc26ae9a7bbfdd4d1429f3e71c2675.tar.gz | |
merged 5.0-bugteam into 5.1-bugteam
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b83c32d3815..474531cb2f3 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -262,7 +262,8 @@ sub testcase_timeout ($) { our $opt_warnings= 1; -our $opt_skip_ndbcluster= 0; +our $opt_include_ndbcluster= 0; +our $opt_skip_ndbcluster= 1; my $exe_ndbd; my $exe_ndb_mgmd; @@ -857,6 +858,7 @@ sub command_line_setup { # Control what test suites or cases to run 'force' => \$opt_force, 'with-ndbcluster-only' => \&collect_option, + 'include-ndbcluster' => \$opt_include_ndbcluster, 'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster, 'suite|suites=s' => \$opt_suites, 'skip-rpl' => \&collect_option, @@ -2387,6 +2389,11 @@ sub vs_config_dirs ($$) { sub check_ndbcluster_support ($) { my $mysqld_variables= shift; + if ($opt_include_ndbcluster) + { + $opt_skip_ndbcluster= 0; + } + if ($opt_skip_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 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 Run test cases which name are prefixed with PREFIX or fulfills REGEX |