diff options
| author | Andreas Metzler <ametzler@bebt.de> | 2020-09-19 10:57:04 +0200 |
|---|---|---|
| committer | Andreas Metzler <ametzler@bebt.de> | 2020-09-19 11:01:42 +0200 |
| commit | 2972b74fe87ef04f1096c05b9b9c49540039c70c (patch) | |
| tree | 9b4c7e64b1621bcaa69fbffa1e3a6e69dc778d86 | |
| parent | d1014defa70915417899a0e922e56ddd9faa96de (diff) | |
| download | gnutls-2972b74fe87ef04f1096c05b9b9c49540039c70c.tar.gz | |
testsuite: Fix $SERV / $GNUTLS_SERV inconsistency
Some tests did not support overriding the PATH to gnutls-serv by setting
the environment variable SERV but used GNUTLS_SERV instead.
Closes #1090
Signed-off-by: Andreas Metzler <ametzler@bebt.de>
| -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 | ||||
| -rwxr-xr-x | tests/suite/testcompat-tls13-openssl.sh | 3 |
4 files changed, 8 insertions, 4 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/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 |