Commit 92796414 authored by Mark Andrews's avatar Mark Andrews

Merge branch '1063-pkcs11_test-is-not-being-expanded' into 'master'

Resolve "@PKCS11_TEST@ is not being expanded"

Closes #1063

See merge request !2000
parents 56e1b76a fbd9c5c9
Pipeline #15539 passed with stages
in 1 minute and 2 seconds
......@@ -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
......
......@@ -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"
......
......@@ -248,7 +248,6 @@ my @substtest = ("CHECKDS",
"JSONSTATS",
"KEYMGR",
"NZD_TOOLS",
"PKCS11_TEST",
"XMLSTATS",
"ZLIB"),
......
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