1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
- improve the logic that decides when ndbcluster should be enabled and the extra
  test suites for MySQL Cluster should be added. Should be consistent and logical now ;)
This commit is contained in:
unknown
2012-11-04 22:11:34 +01:00
parent 20ca730f56
commit 574b107a57
2 changed files with 85 additions and 42 deletions

View File

@ -963,18 +963,11 @@ sub collect_one_test_case {
if ( $tinfo->{'ndb_test'} )
{
# This is a NDB test
if ( $::opt_skip_ndbcluster == 2 )
if ( $::ndbcluster_enabled == 0)
{
# Ndb is not supported, skip it
# ndbcluster is disabled
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "No ndbcluster support or ndb tests not enabled";
return $tinfo;
}
elsif ( $::opt_skip_ndbcluster )
{
# All ndb test's should be skipped
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
$tinfo->{'comment'}= "ndbcluster disabled";
return $tinfo;
}
}