database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.1-new

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@shellback.(none)
2006-05-18 20:21:43 +02:00
parent 8d1499a6ad ed349f7c69
commit f4920b706f
19 changed files with 153 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -455,6 +455,16 @@ sub collect_one_test_case($$$$$$$) {
"Test case '$tname' is skipped.");
}
}
else
{
mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");
if ( ! $tinfo->{'innodb_test'} )
{
# mtr_report("Adding '--skip-innodb' to $tinfo->{'name'}");
push(@{$tinfo->{'master_opt'}}, "--skip-innodb");
}
}
# We can't restart a running server that may be in use
@@ -463,7 +473,39 @@ sub collect_one_test_case($$$$$$$) {
{
$tinfo->{'skip'}= 1;
}
}
sub mtr_options_from_test_file($$$) {
my $tinfo= shift;
my $file= shift;
open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");
my @args;
while ( <FILE> )
{
chomp;
# Check if test uses innodb
if ( defined mtr_match_substring($_,"include/have_innodb.inc"))
{
$tinfo->{'innodb_test'} = 1;
}
# If test sources another file, open it as well
my $value= mtr_match_prefix($_, "--source");
if ( defined $value)
{
$value=~ s/^\s+//; # Remove leading space
$value=~ s/\s+$//; # Remove ending space
my $sourced_file= "$::glob_mysql_test_dir/$value";
mtr_options_from_test_file($tinfo, $sourced_file);
}
}
close FILE;
}
1;