From: Mark Andrews <marka@isc.org>
Date: Tue, 4 Jun 2019 05:31:26 +0000 (+1000)
Subject: make PKCS11_TEST unix only
X-Git-Tag: v9.15.1~14^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbd9c5c97f94e30e3d435a10d9f5d6c450478e9c;p=thirdparty%2Fbind9.git

make PKCS11_TEST unix only
---

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index e32f1a28fbf..c18d5272e29 100644
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -40,7 +40,7 @@ export LANG=C
 # SEQUENTIAL_UNIX in conf.sh.in; those that only run on windows should
 # be added to SEQUENTIAL_WINDOWS in conf.sh.win32.
 #
-SEQUENTIAL_COMMON="ecdsa eddsa @PKCS11_TEST@ tkey"
+SEQUENTIAL_COMMON="ecdsa eddsa tkey"
 
 #
 # These tests can use ports assigned by the caller (other than 5300
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 70d5da8660d..ff48313fbb4 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -75,7 +75,7 @@ KRB5_CONFIG=/dev/null
 #
 # Construct the lists of tests to run
 #
-SEQUENTIAL_UNIX=""
+SEQUENTIAL_UNIX="@PKCS11_TEST@"
 SEQUENTIALDIRS="$SEQUENTIAL_COMMON $SEQUENTIAL_UNIX"
 
 PARALLEL_UNIX="@CHECKDS@ @COVERAGE@ @DNSTAP@ @KEYMGR@ logfileconfig"
diff --git a/win32utils/Configure b/win32utils/Configure
index 60c5e0e103f..a378f44847a 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -248,7 +248,6 @@ my @substtest = ("CHECKDS",
                  "JSONSTATS",
                  "KEYMGR",
                  "NZD_TOOLS",
-                 "PKCS11_TEST",
                  "XMLSTATS",
                  "ZLIB"),