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

Create 'main' test directory and move 't' and 'r' there

Browse Source
This commit is contained in:
Michael Widenius
2018-03-09 14:05:35 +02:00
committed by Monty
parent ab1941266c
commit a7abddeffa
2114 changed files with 75 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/lib/mtr_cases.pm
View File

@ -292,7 +292,7 @@ sub combinations_from_file($$)
} else {
return () if @::opt_combinations or not -f $filename;
# Read combinations file in my.cnf format
mtr_verbose("Read combinations file");
mtr_verbose("Read combinations file $filename");
my $config= My::Config->new($filename);
foreach my $group ($config->option_groups()) {
my $comb= { name => $group->name(), comb_opt => [] };
@ -398,7 +398,7 @@ sub collect_suite_name($$)
}
}
} else {
$suites{$suitename} = [ $::glob_mysql_test_dir,
$suites{$suitename} = [ $::glob_mysql_test_dir . "/main",
my_find_dir(dirname($::glob_mysql_test_dir),
[ @plugin_suitedirs ],
'main', NOT_REQUIRED) ];
@ -470,7 +470,9 @@ sub process_suite {
$suitename = $basename;
}
my $suite = load_suite_object($suitename, $suitedir);
my $suite = load_suite_object($suitename, (($suitename eq "main") ?
$::glob_mysql_test_dir :
$suitedir));
#
# Read suite config files, unless it was done aleady
@ -647,7 +649,7 @@ sub make_combinations($$@)
{
# Copy test options
my $new_test= $test->copy();
# Prepend the combination options to master_opt and slave_opt
# (on the command line combinations go *before* .opt files)
unshift @{$new_test->{master_opt}}, @{$comb->{comb_opt}};
@ -693,8 +695,6 @@ sub collect_one_test_case {
my $tpath = shift;
my $tname = shift;
my %test_combs = map { $_ => 1 } @_;
my $suitename = $suite->{name};
my $name = "$suitename.$tname";
my $filename = "$tpath/${tname}.test";
@ -1096,6 +1096,7 @@ sub get_tags_from_file($$) {
$file_to_slave_opts{$file}= $slave_opts;
$file_combinations{$file}= [ ::uniq(@combinations) ];
$file_in_overlay{$file} = 1 if $in_overlay;
return @{$tags};
}