database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Improve the function that parses test files looking for what features it uses

Browse Source 
Now also detects "source nnnn;" command, previous version only detected
"--source"
This commit is contained in:
unknown
2006-10-13 11:05:46 +02:00
parent a4c972bcf7
commit b35617cdba
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -575,8 +575,6 @@ sub mtr_options_from_test_file($$) {
while ( my $line= <$F> ) while ( my $line= <$F> )
{ {
next if ( $line !~ /^--/ );
# Match this line against tag in "tags" array # Match this line against tag in "tags" array
foreach my $tag (@tags) foreach my $tag (@tags)
{ {
@@ -588,14 +586,21 @@ sub mtr_options_from_test_file($$) {
} }
# If test sources another file, open it as well # If test sources another file, open it as well
if ( $line =~ /^\-\-([[:space:]]*)source(.*)$/ ) if ( $line =~ /^\-\-([[:space:]]*)source(.*)$/ or
$line =~ /^([[:space:]]*)source(.*);$/ )
{ {
my $value= $2; my $value= $2;
$value =~ s/^\s+//; # Remove leading space $value =~ s/^\s+//; # Remove leading space
$value =~ s/[[:space:]]+$//; # Remove ending space $value =~ s/[[:space:]]+$//; # Remove ending space
my $sourced_file= "$::glob_mysql_test_dir/$value"; my $sourced_file= "$::glob_mysql_test_dir/$value";
mtr_options_from_test_file($tinfo, $sourced_file); if ( -f $sourced_file )
{
# Only source the file if it exists, we may get
# false positives in the regexes above if someone
# writes "source nnnn;" in a test case(such as mysqltest.test)
mtr_options_from_test_file($tinfo, $sourced_file);
}
} }
} }