mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
- Add autodetection of which my.cnfs to use for each testcase if suite does
not have a my.cnf of it's own - Fix paths: master-data => mysqld.1/data, ../std_data_ln => MYSQLTEST_VARDIR/std_data
This commit is contained in:
@ -892,8 +892,19 @@ sub collect_one_test_case {
|
||||
my $config= "$suitedir/my.cnf";
|
||||
if (! -f $config )
|
||||
{
|
||||
# Suite has no config, use default.cnf
|
||||
# assume default.cnf will be used
|
||||
$config= "include/default_my.cnf";
|
||||
|
||||
# Suite has no config, autodetect which one to use
|
||||
if ( $tinfo->{rpl_test} ){
|
||||
$config= "suite/rpl/my.cnf";
|
||||
if ( $tinfo->{ndb_test} ){
|
||||
$config= "suite/rpl_ndb/my.cnf";
|
||||
}
|
||||
}
|
||||
elsif ( $tinfo->{ndb_test} ){
|
||||
$config= "suite/ndb/my.cnf";
|
||||
}
|
||||
}
|
||||
$tinfo->{template_path}= $config;
|
||||
}
|
||||
|
Reference in New Issue
Block a user