1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for specifying suites not located in mysql-test/suite/

Browse Source 
Example otions that will all run binlog_stm_binlog.test in suite/binlog:
 --suite=binlog binlog.binlog_stm_binlog
 --suite=binlog binlog_stm_binlog
 binlog_stm_binlog
 --suite=suite/binlog binlog.binlog_stm_binlog
 --suite=suite/binlog binlog_stm_binlog
This commit is contained in:
msvensson@pilot.(none) 2007-09-11 15:00:52 +02:00
parent 122f5f6cd0
commit f26d69e01a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mysql-test/lib/mtr_cases.pl
View File

@ -151,19 +151,16 @@ sub collect_one_suite($$)
mtr_verbose("Collecting: $suite"); mtr_verbose("Collecting: $suite");
my $testdir; my $suitedir= "$::glob_mysql_test_dir"; # Default
my $resdir; if ( $suite ne "main" )
{
$suitedir= mtr_path_exists("$suitedir/suite/$suite",
"$suitedir/$suite");
mtr_verbose("suitedir: $suitedir");
}
if ( $suite eq "main" ) my $testdir= "$suitedir/t";
{ my $resdir= "$suitedir/r";
$testdir= "$::glob_mysql_test_dir/t";
$resdir= "$::glob_mysql_test_dir/r";
}
else
{
$testdir= "$::glob_mysql_test_dir/suite/$suite/t";
$resdir= "$::glob_mysql_test_dir/suite/$suite/r";
}
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Build a hash of disabled testcases for this suite # Build a hash of disabled testcases for this suite
@ -205,7 +202,7 @@ sub collect_one_suite($$)
$tname = basename($tname); $tname = basename($tname);
# Get rid of suite part # Get rid of suite part
$tname =~ s/^$suite\.//; $tname =~ s/^(.*)\.//;
# Check if the extenstion has been specified. # Check if the extenstion has been specified.
@ -333,7 +330,7 @@ sub collect_one_test_case($$$$$$$$$) {
my $tinfo= {}; my $tinfo= {};
$tinfo->{'name'}= "$suite.$tname"; $tinfo->{'name'}= basename($suite) . ".$tname";
$tinfo->{'result_file'}= "$resdir/$tname.result"; $tinfo->{'result_file'}= "$resdir/$tname.result";
$tinfo->{'component_id'} = $component_id; $tinfo->{'component_id'} = $component_id;
push(@$cases, $tinfo); push(@$cases, $tinfo);