From d49f8e9f05c822c240d1878109eccdb92b285ff2 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Wed, 14 Feb 2018 23:21:58 +0000
Subject: [PATCH] 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).
---
 mysql-test/suite/unit/suite.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mysql-test/suite/unit/suite.pm b/mysql-test/suite/unit/suite.pm
index 4a46272f041..c92363a8601 100644
--- a/mysql-test/suite/unit/suite.pm
+++ b/mysql-test/suite/unit/suite.pm
@@ -40,8 +40,8 @@ sub start_test {
   my $bin=$ENV{MTR_BINDIR} || '..';
   return "Not run for embedded server" if $::opt_embedded_server;
   return "Not configured to run ctest" unless -f "$bin/CTestTestfile.cmake";
-  my ($ctest_vs)= $opt_vs_config ? "--build-config $opt_vs_config" : "";
-  my (@ctest_list)= `cd "$bin" && ctest $opt_vs_config --show-only --verbose`;
+  my ($ctest_vs)= $opt_vs_config ? "-C $opt_vs_config" : "";
+  my (@ctest_list)= `cd "$bin" && ctest $ctest_vs --show-only --verbose`;
   return "No ctest" if $?;
 
   my ($command, %tests, $prefix);
@@ -51,7 +51,9 @@ sub start_test {
       $command= $';
       $prefix= /libmariadb/ ? 'conc_' : '';
     } elsif (/^ +Test +#\d+: +/) {
-      $tests{$prefix.$'}=$command;
+      if ($command ne "NOT_AVAILABLE") {
+        $tests{$prefix.$'}=$command;
+      }
     }
   }
   bless { ctests => { %tests } };