make PKCS11_TEST unix only

(cherry picked from commit fbd9c5c97f94e30e3d435a10d9f5d6c450478e9c)

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index e32f1a28fbffcac40afd4ccfe02e133535d63f4c..c18d5272e29a7998db998add11ae9734c9f75ac8 100644 (file)
--- 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 8cecc8f9505b69092dd62edd4c3c41488633a4aa..23a3f93a69db6cbf4554fadad39bc1ec42945f21 100644 (file)
--- 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 9731b0c187aac94bb14649f79b1fd4f6b0238c9d..67a8d046188208e40bc08e7a40be2e7c0bd2da66 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -248,7 +248,6 @@ my @substtest = ("CHECKDS",
                  "JSONSTATS",
                  "KEYMGR",
                  "NZD_TOOLS",
-                 "PKCS11_TEST",
                  "XMLSTATS",
                  "ZLIB"),