diff options
author | Daiki Ueno <ueno@gnu.org> | 2020-10-03 16:42:07 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2020-10-03 16:42:07 +0000 |
commit | 6f034aa2e9f140626de2b9413715651dffe9e394 (patch) | |
tree | 0a594b8b65bddc9303e1fd6dcc80807e3a79e602 /tests/testpkcs11.sh | |
parent | 12a3bb06a19c78607e9f2a0a59c2e71f43a22b8b (diff) | |
parent | 2c1d544c5d9ad12afec09cc6ede40aa8f4693fd2 (diff) | |
download | gnutls-6f034aa2e9f140626de2b9413715651dffe9e394.tar.gz |
Merge branch 'tmp-sh-tests' into 'master'
tests: simplify shell-script usage
See merge request gnutls/gnutls!1337
Diffstat (limited to 'tests/testpkcs11.sh')
-rwxr-xr-x | tests/testpkcs11.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/testpkcs11.sh b/tests/testpkcs11.sh index 9458af2381..ccdcfbf5ce 100755 --- a/tests/testpkcs11.sh +++ b/tests/testpkcs11.sh @@ -18,12 +18,12 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -P11TOOL="${P11TOOL:-../src/p11tool${EXEEXT}}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${P11TOOL=../src/p11tool${EXEEXT}} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} RETCODE=0 if test "${GNUTLS_FORCE_FIPS_MODE}" = 1;then @@ -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 |