Skip to content

Commit d49f8e9

Browse files
committed
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).
1 parent 8a923a6 commit d49f8e9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

mysql-test/suite/unit/suite.pm

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ sub start_test {
4040
my $bin=$ENV{MTR_BINDIR} || '..';
4141
return "Not run for embedded server" if $::opt_embedded_server;
4242
return "Not configured to run ctest" unless -f "$bin/CTestTestfile.cmake";
43-
my ($ctest_vs)= $opt_vs_config ? "--build-config $opt_vs_config" : "";
44-
my (@ctest_list)= `cd "$bin" && ctest $opt_vs_config --show-only --verbose`;
43+
my ($ctest_vs)= $opt_vs_config ? "-C $opt_vs_config" : "";
44+
my (@ctest_list)= `cd "$bin" && ctest $ctest_vs --show-only --verbose`;
4545
return "No ctest" if $?;
4646

4747
my ($command, %tests, $prefix);
@@ -51,7 +51,9 @@ sub start_test {
5151
$command= $';
5252
$prefix= /libmariadb/ ? 'conc_' : '';
5353
} elsif (/^ +Test +#\d+: +/) {
54-
$tests{$prefix.$'}=$command;
54+
if ($command ne "NOT_AVAILABLE") {
55+
$tests{$prefix.$'}=$command;
56+
}
5557
}
5658
}
5759
bless { ctests => { %tests } };

0 commit comments

Comments
 (0)