diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-05-13 13:41:53 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-05-20 17:42:03 +0200 |
| commit | 478cdc0742ece77d443de2e8642dcb1a059029c3 (patch) | |
| tree | e0e9bf4644164d0e22780f1e07a7ac5685553473 /tests/suite/testsrn.sh | |
| parent | 267a0de476dfeec9fd3efc1b48aa6174d7575f63 (diff) | |
| download | gnutls-478cdc0742ece77d443de2e8642dcb1a059029c3.tar.gz | |
tests: simplified server launching process
Also attempt to use a new port on every started server and
added a waiting period for the port to become re-usable.
Diffstat (limited to 'tests/suite/testsrn.sh')
| -rwxr-xr-x | tests/suite/testsrn.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/suite/testsrn.sh b/tests/suite/testsrn.sh index d43f214bef..1c6bfc3191 100755 --- a/tests/suite/testsrn.sh +++ b/tests/suite/testsrn.sh @@ -36,11 +36,10 @@ fi . "${srcdir}/../scripts/common.sh" -PORT="${PORT:-${RPORT}}" - echo "Checking Safe renegotiation" -launch_server $$ --echo --priority NORMAL:+ANON-DH:%PARTIAL_RENEGOTIATION --dhparams "${srcdir}/params.dh" >/dev/null 2>&1 & +eval "${GETPORT}" +launch_server $$ --echo --priority NORMAL:+ANON-DH:%PARTIAL_RENEGOTIATION --dhparams "${srcdir}/params.dh" PID=$! wait_server ${PID} @@ -63,7 +62,8 @@ ${VALGRIND} "${CLI}" -p "${PORT}" 127.0.0.1 --rehandshake --priority NORMAL:+ANO kill ${PID} wait -launch_server $$ --echo --priority NORMAL:+ANON-DH:%SAFE_RENEGOTIATION --dhparams "${srcdir}/params.dh" >/dev/null & +eval "${GETPORT}" +launch_server $$ --echo --priority NORMAL:+ANON-DH:%SAFE_RENEGOTIATION --dhparams "${srcdir}/params.dh" PID=$! wait_server ${PID} @@ -82,7 +82,8 @@ ${VALGRIND} "${CLI}" -p "${PORT}" 127.0.0.1 --rehandshake --priority NORMAL:+ANO kill ${PID} wait -launch_server $$ --echo --priority NORMAL:+ANON-DH:%DISABLE_SAFE_RENEGOTIATION --dhparams "${srcdir}/params.dh" >/dev/null & +eval "${GETPORT}" +launch_server $$ --echo --priority NORMAL:+ANON-DH:%DISABLE_SAFE_RENEGOTIATION --dhparams "${srcdir}/params.dh" PID=$! wait_server ${PID} |