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

Fixed unit test to not 'bail out' if some tests are not compiled.

Browse Source 
Before the changes two things could happen:
- "path required name explain_filename path" error
- unit test never finishead (as it tried to execute just /bin/sh as
  a test case)
This commit is contained in:
Monty
2021-03-01 17:51:44 +02:00
parent 415409579a
commit 3f15d3bad9
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/suite/unit/suite.pm
View File

@@ -20,7 +20,6 @@ sub start_test {
($path, $args) = ($cmd, , [ ]) ($path, $args) = ($cmd, , [ ])
} }
my $oldpwd=getcwd(); my $oldpwd=getcwd();
chdir $::opt_vardir; chdir $::opt_vardir;
my $proc=My::SafeProcess->new my $proc=My::SafeProcess->new
@@ -44,15 +43,17 @@ sub start_test {
my (@ctest_list)= `cd "$bin" && ctest $ctest_vs --show-only --verbose`; my (@ctest_list)= `cd "$bin" && ctest $ctest_vs --show-only --verbose`;
return "No ctest" if $?; return "No ctest" if $?;
$ENV{MYSQL_TEST_PLUGINDIR}=$::plugindir;
my ($command, %tests, $prefix); my ($command, %tests, $prefix);
for (@ctest_list) { for (@ctest_list) {
chomp; chomp;
if (/^\d+: Test command: +/) { if (/^\d+: Test command: +([^ \t]+)/) {
$command= $'; $command= $1;
$prefix= /libmariadb/ ? 'conc_' : ''; $prefix= /libmariadb/ ? 'conc_' : '';
} elsif (/^ +Test +#\d+: +/) { } elsif (/^ +Test +#\d+: ([^ \t]+)/) {
if ($command ne "NOT_AVAILABLE") { if ($command ne "NOT_AVAILABLE" && $command ne "/bin/sh") {
$tests{$prefix.$'}=$command; $tests{$prefix.$1}=$command;
} }
} }
} }