From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 3 May 2016 09:49:09 +0000 (+0200)
Subject: tests: do not block server errors in testdsa from being printed out
X-Git-Tag: gnutls_3_5_0~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fca89a2d2a912ce82f5e23c7a7a496ca8a7a73f4;p=thirdparty%2Fgnutls.git

tests: do not block server errors in testdsa from being printed out

Also added a delay prior to launching next server instance.
---

diff --git a/tests/dsa/testdsa b/tests/dsa/testdsa
index 1f658fb359..4890056ce8 100755
--- a/tests/dsa/testdsa
+++ b/tests/dsa/testdsa
@@ -53,7 +53,7 @@ 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 2>&1 &
+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 &
 PID=$!
 wait_server "${PID}"
 
@@ -84,9 +84,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 2>&1 &
+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 &
 PID=$!
 wait_server "${PID}"
 
@@ -129,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 2>&1 &
+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 &
 PID=$!
 wait_server "${PID}"
 
@@ -158,9 +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 2>&1 &
+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 &
 PID=$!
 wait_server "${PID}"