diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-09-23 09:34:09 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-09-25 10:53:35 +0200 |
| commit | a7b126acd4793ced574acb68bdbf5c6a48bb4ad5 (patch) | |
| tree | 9e8d24f38c1824db2095e35a66941d0dbfd78ebe | |
| parent | d3fdcc737d03f5e8570b105c3d62dc6f8ce5ef2f (diff) | |
| download | gnutls-a7b126acd4793ced574acb68bdbf5c6a48bb4ad5.tar.gz | |
tests: remove launch_pkcs11_server
This function is only used by testpkcs11.sh.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
| -rw-r--r-- | tests/scripts/common.sh | 9 | ||||
| -rwxr-xr-x | tests/testpkcs11.sh | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh index 4a4add6493..40bff32323 100644 --- 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 95b585ab6f..ccdcfbf5ce 100755 --- 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 |