diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-05-13 13:41:53 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-05-13 20:15:19 +0200 |
| commit | 74edce5051e1ae4e35c058a1776671338bcf3a49 (patch) | |
| tree | 5fa7ae496036003bf8aac4fb81612f501451cd9d /tests/dsa | |
| parent | 5b1d751f23e87b332b3cb3e86e488fb450abbe1c (diff) | |
| download | gnutls-74edce5051e1ae4e35c058a1776671338bcf3a49.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/dsa')
| -rwxr-xr-x | tests/dsa/testdsa | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/dsa/testdsa b/tests/dsa/testdsa index 4890056ce8..e1b9dcf583 100755 --- a/tests/dsa/testdsa +++ b/tests/dsa/testdsa @@ -37,8 +37,6 @@ fi . "${srcdir}/../scripts/common.sh" -PORT="${PORT:-$RPORT}" - size=`${VALGRIND} "${CERTTOOL}" -i --infile "${srcdir}/dsa-pubkey-1018.pem"|grep "Algorithm Secur"|cut -d '(' -f 2|cut -d ' ' -f 1` if test "${size}" != "1024"; then @@ -53,7 +51,8 @@ echo "Checking various DSA key sizes (port ${PORT})" echo "Checking DSA-1024 with TLS 1.0" -launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.1024.pem" --x509keyfile "${srcdir}/dsa.1024.pem" >/dev/null & +eval "${GETPORT}" +launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.1024.pem" --x509keyfile "${srcdir}/dsa.1024.pem" PID=$! wait_server "${PID}" @@ -84,10 +83,10 @@ wait # DSA 1024 + TLS 1.2 -sleep 3 echo "Checking DSA-1024 with TLS 1.2" -launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.1024.pem" --x509keyfile "${srcdir}/dsa.1024.pem" >/dev/null & +eval "${GETPORT}" +launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.1024.pem" --x509keyfile "${srcdir}/dsa.1024.pem" PID=$! wait_server "${PID}" @@ -119,7 +118,8 @@ wait #echo "Checking DSA-2048 with TLS 1.0" -#launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile "${srcdir}/cert.dsa.2048.pem" --x509keyfile "${srcdir}/dsa.2048.pem" >/dev/null 2>&1 & +#eval "${GETPORT}" +#launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile "${srcdir}/cert.dsa.2048.pem" --x509keyfile "${srcdir}/dsa.2048.pem" #PID=$! #wait_server "${PID}" @@ -130,10 +130,10 @@ wait #wait # DSA 2048 + TLS 1.2 -sleep 3 echo "Checking DSA-2048 with TLS 1.2" -launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.2048.pem" --x509keyfile "${srcdir}/dsa.2048.pem" >/dev/null & +eval "${GETPORT}" +launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.2048.pem" --x509keyfile "${srcdir}/dsa.2048.pem" PID=$! wait_server "${PID}" @@ -147,7 +147,7 @@ wait #echo "Checking DSA-3072 with TLS 1.0" -#launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile "${srcdir}/cert.dsa.3072.pem" --x509keyfile "${srcdir}/dsa.3072.pem" >/dev/null 2>&1 & +#launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile "${srcdir}/cert.dsa.3072.pem" --x509keyfile "${srcdir}/dsa.3072.pem" #PID=$! #wait_server "${PID}" # @@ -159,10 +159,10 @@ wait # DSA 3072 + TLS 1.2 -sleep 3 echo "Checking DSA-3072 with TLS 1.2" -launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.3072.pem" --x509keyfile "${srcdir}/dsa.3072.pem" >/dev/null & +eval "${GETPORT}" +launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.3072.pem" --x509keyfile "${srcdir}/dsa.3072.pem" PID=$! wait_server "${PID}" |