diff options
Diffstat (limited to 'mysql-test/lib/mtr_cases.pl')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl index d6068c9691a..3978700c3e8 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pl @@ -252,19 +252,27 @@ sub collect_one_test_case($$$$$$$) { $tinfo->{'slave_restart'}= 1; } - if ( ( $::opt_with_ndbcluster or $::glob_use_running_ndbcluster ) and - ( $::opt_with_ndbcluster_all or defined mtr_match_substring($tname,"ndb") )) + if ( $::opt_with_ndbcluster_all or defined mtr_match_substring($tname,"ndb") ) { + # This is an ndb test or all tests should be run with ndb cluster started $tinfo->{'ndb_test'}= 1; + if ( $::opt_skip_ndbcluster ) + { + # All ndb test's should be skipped + $tinfo->{'skip'}= 1; + return; + } } else { + # This is not a ndb test + $tinfo->{'ndb_test'}= 0; if ( $::opt_with_ndbcluster_only ) - { + { + # Only the ndb test should be run, all other should be skipped $tinfo->{'skip'}= 1; return; } - $tinfo->{'ndb_test'}= 0; } # FIXME what about embedded_server + ndbcluster, skip ?! |