tests: remove launch_pkcs11_server

This function is only used by testpkcs11.sh.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh
index 4a4add649381c46fe4c97873103f9d3ad175b937..40bff32323e43ca92795543d6e4a0762c74b2405 100644 (file)
--- a/tests/scripts/common.sh
+++ b/tests/scripts/common.sh
@@ -165,15 +165,6 @@ launch_server() {
        ${SERV} ${DEBUG} -p "${PORT}" "$@" >${LOGFILE-/dev/null} &
 }
 
-launch_pkcs11_server() {
-       PROVIDER="$1"
-       shift
-
-       wait_for_free_port ${PORT}
-
-       ${VALGRIND} ${SERV} ${PROVIDER} ${DEBUG} -p "${PORT}" "$@" &
-}
-
 launch_bare_server() {
        wait_for_free_port ${PORT}
        ${SERV} "$@" >${LOGFILE-/dev/null} &

diff --git a/tests/testpkcs11.sh b/tests/testpkcs11.sh
index 95b585ab6fc870c6e0dc92be0b4dd5823d75faa4..ccdcfbf5ced455d1195747dd781a7486db65d425 100755 (executable)
--- a/tests/testpkcs11.sh
+++ b/tests/testpkcs11.sh
@@ -900,7 +900,7 @@ use_certificate_test () {
        echo -n "* Using PKCS #11 with gnutls-cli (${txt})... "
        # start server
        eval "${GETPORT}"
-       launch_pkcs11_server "${ADDITIONAL_PARAM}" --echo --priority NORMAL --x509certfile="${certfile}" \
+       launch_server ${ADDITIONAL_PARAM} --echo --priority NORMAL --x509certfile="${certfile}" \
                --x509keyfile="$keyfile" --x509cafile="${cafile}" \
                --verify-client-cert --require-client-cert >>"${LOGFILE}" 2>&1