diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-09-21 05:25:23 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-09-21 05:25:23 +0000 |
| commit | 7202e921db9da6faddcab8d2ac872508ee2281be (patch) | |
| tree | b8b0b0393032b2eee8d86cbb51cc47284450a005 | |
| parent | a431b6e3c032fa47ecc3c233babcad602056b892 (diff) | |
| parent | 2972b74fe87ef04f1096c05b9b9c49540039c70c (diff) | |
| download | gnutls-7202e921db9da6faddcab8d2ac872508ee2281be.tar.gz | |
Merge branch 'tmp-ametzler-1090-testsuite' into 'master'
Fix inconsistent handling of $SERV environment variable in testsuite
Closes #1090
See merge request gnutls/gnutls!1331
| -rwxr-xr-x | tests/cert-reencoding.sh | 3 | ||||
| -rwxr-xr-x | tests/ocsp-tests/ocsp-must-staple-connection | 3 | ||||
| -rwxr-xr-x | tests/ocsp-tests/ocsp-tls-connection | 3 | ||||
| -rw-r--r-- | tests/scripts/common.sh | 6 | ||||
| -rwxr-xr-x | tests/suite/testcompat-tls13-openssl.sh | 3 |
5 files changed, 11 insertions, 7 deletions
diff --git a/tests/cert-reencoding.sh b/tests/cert-reencoding.sh index 240d336778..3469c42d22 100755 --- a/tests/cert-reencoding.sh +++ b/tests/cert-reencoding.sh @@ -24,7 +24,8 @@ srcdir="${srcdir:-.}" CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" OCSPTOOL="${OCSPTOOL:-../src/ocsptool${EXEEXT}}" -GNUTLS_SERV="${GNUTLS_SERV:-../src/gnutls-serv${EXEEXT}}" +GNUTLS_SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" +unset SERV GNUTLS_CLI="${GNUTLS_CLI:-../src/gnutls-cli${EXEEXT}}" DIFF="${DIFF:-diff}" SERVER_CERT_FILE="cert.$$.pem.tmp" diff --git a/tests/ocsp-tests/ocsp-must-staple-connection b/tests/ocsp-tests/ocsp-must-staple-connection index 55d718ddf0..7da31765ed 100755 --- a/tests/ocsp-tests/ocsp-must-staple-connection +++ b/tests/ocsp-tests/ocsp-must-staple-connection @@ -21,7 +21,8 @@ srcdir="${srcdir:-.}" CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" OCSPTOOL="${OCSPTOOL:-../src/ocsptool${EXEEXT}}" -GNUTLS_SERV="${GNUTLS_SERV:-../src/gnutls-serv${EXEEXT}}" +GNUTLS_SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" +unset SERV GNUTLS_CLI="${GNUTLS_CLI:-../src/gnutls-cli${EXEEXT}}" DIFF="${DIFF:-diff}" TEMPLATE_FILE="ms-out.$$.tmpl.tmp" diff --git a/tests/ocsp-tests/ocsp-tls-connection b/tests/ocsp-tests/ocsp-tls-connection index 870f4ff78b..fba9a6eb1c 100755 --- a/tests/ocsp-tests/ocsp-tls-connection +++ b/tests/ocsp-tests/ocsp-tls-connection @@ -24,7 +24,8 @@ srcdir="${srcdir:-.}" CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" OCSPTOOL="${OCSPTOOL:-../src/ocsptool${EXEEXT}}" -GNUTLS_SERV="${GNUTLS_SERV:-../src/gnutls-serv${EXEEXT}}" +GNUTLS_SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" +unset SERV GNUTLS_CLI="${GNUTLS_CLI:-../src/gnutls-cli${EXEEXT}}" DIFF="${DIFF:-diff}" TEMPLATE_FILE="out.$$.tmpl.tmp" diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh index 6ae19fa586..3229510385 100644 --- a/tests/scripts/common.sh +++ b/tests/scripts/common.sh @@ -165,7 +165,7 @@ launch_server() { shift wait_for_free_port ${PORT} - ${SERV} ${DEBUG} -p "${PORT}" $* >${LOGFILE-/dev/null} & + ${SERV} ${DEBUG} -p "${PORT}" "$@" >${LOGFILE-/dev/null} & } launch_pkcs11_server() { @@ -176,7 +176,7 @@ launch_pkcs11_server() { wait_for_free_port ${PORT} - ${VALGRIND} ${SERV} ${PROVIDER} ${DEBUG} -p "${PORT}" $* & + ${VALGRIND} ${SERV} ${PROVIDER} ${DEBUG} -p "${PORT}" "$@" & } launch_bare_server() { @@ -184,7 +184,7 @@ launch_bare_server() { shift wait_for_free_port ${PORT} - ${SERV} $* >${LOGFILE-/dev/null} & + ${SERV} "$@" >${LOGFILE-/dev/null} & } wait_server() { diff --git a/tests/suite/testcompat-tls13-openssl.sh b/tests/suite/testcompat-tls13-openssl.sh index bc198a02b6..1090a47763 100755 --- a/tests/suite/testcompat-tls13-openssl.sh +++ b/tests/suite/testcompat-tls13-openssl.sh @@ -32,6 +32,7 @@ abs_top_srcdir="${abs_top_srcdir:-$(pwd)/../../}" srcdir="${srcdir:-.}" +GNUTLS_SERV="${SERV:-../../src/gnutls-serv${EXEEXT}}" CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}" unset RETCODE @@ -309,7 +310,7 @@ echo_cmd "${PREFIX}" echo_cmd "${PREFIX}###############################################" echo_cmd "${PREFIX}# Server mode tests (gnutls server-openssl cli#" echo_cmd "${PREFIX}###############################################" -SERV="../../src/gnutls-serv${EXEEXT} -q" +SERV="${GNUTLS_SERV} -q" # Note that openssl s_client does not return error code on failure |