Commit d49f8e9f authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Windows,tests : fix pcre_test_bat test from pcre library.

Tests that are not available in certain configurations, are marked as
Test command : NOT_AVAILABLE in ctest output.

pcre_test_bat does not work without ctest's -C option (--build-config
that was used earlier was wrong).
parent 8a923a6d
...@@ -40,8 +40,8 @@ sub start_test { ...@@ -40,8 +40,8 @@ sub start_test {
my $bin=$ENV{MTR_BINDIR} || '..'; my $bin=$ENV{MTR_BINDIR} || '..';
return "Not run for embedded server" if $::opt_embedded_server; return "Not run for embedded server" if $::opt_embedded_server;
return "Not configured to run ctest" unless -f "$bin/CTestTestfile.cmake"; return "Not configured to run ctest" unless -f "$bin/CTestTestfile.cmake";
my ($ctest_vs)= $opt_vs_config ? "--build-config $opt_vs_config" : ""; my ($ctest_vs)= $opt_vs_config ? "-C $opt_vs_config" : "";
my (@ctest_list)= `cd "$bin" && ctest $opt_vs_config --show-only --verbose`; my (@ctest_list)= `cd "$bin" && ctest $ctest_vs --show-only --verbose`;
return "No ctest" if $?; return "No ctest" if $?;
my ($command, %tests, $prefix); my ($command, %tests, $prefix);
...@@ -51,8 +51,10 @@ sub start_test { ...@@ -51,8 +51,10 @@ sub start_test {
$command= $'; $command= $';
$prefix= /libmariadb/ ? 'conc_' : ''; $prefix= /libmariadb/ ? 'conc_' : '';
} elsif (/^ +Test +#\d+: +/) { } elsif (/^ +Test +#\d+: +/) {
if ($command ne "NOT_AVAILABLE") {
$tests{$prefix.$'}=$command; $tests{$prefix.$'}=$command;
} }
} }
}
bless { ctests => { %tests } }; bless { ctests => { %tests } };
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment