mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
Fixed unit test to not 'bail out' if some tests are not compiled.
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:
parent
415409579a
commit
3f15d3bad9
1 changed files with 7 additions and 6 deletions
|
@ -20,7 +20,6 @@ sub start_test {
|
|||
($path, $args) = ($cmd, , [ ])
|
||||
}
|
||||
|
||||
|
||||
my $oldpwd=getcwd();
|
||||
chdir $::opt_vardir;
|
||||
my $proc=My::SafeProcess->new
|
||||
|
@ -44,15 +43,17 @@ sub start_test {
|
|||
my (@ctest_list)= `cd "$bin" && ctest $ctest_vs --show-only --verbose`;
|
||||
return "No ctest" if $?;
|
||||
|
||||
$ENV{MYSQL_TEST_PLUGINDIR}=$::plugindir;
|
||||
|
||||
my ($command, %tests, $prefix);
|
||||
for (@ctest_list) {
|
||||
chomp;
|
||||
if (/^\d+: Test command: +/) {
|
||||
$command= $';
|
||||
if (/^\d+: Test command: +([^ \t]+)/) {
|
||||
$command= $1;
|
||||
$prefix= /libmariadb/ ? 'conc_' : '';
|
||||
} elsif (/^ +Test +#\d+: +/) {
|
||||
if ($command ne "NOT_AVAILABLE") {
|
||||
$tests{$prefix.$'}=$command;
|
||||
} elsif (/^ +Test +#\d+: ([^ \t]+)/) {
|
||||
if ($command ne "NOT_AVAILABLE" && $command ne "/bin/sh") {
|
||||
$tests{$prefix.$1}=$command;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue