X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Ftests-normal.sh;h=c16de5144b9bc0d75b9064a80a03b8ca0859565a;hb=47779cdadbff9f9f7848828c97bf1dc63c3cb08f;hp=83b63f484a1770694c5bf6f61077621a8e1a6f3b;hpb=f30571ef2623133a3d884fe99eb65093292433ac;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
index 83b63f4..c16de51 100755
--- a/tests/tests-normal.sh
+++ b/tests/tests-normal.sh
@@ -27,9 +27,9 @@ cleanup
 tlsproxy_setup
 
 # Normal tests.
-tlsproxy 4711
-server --x509certfile "$srcdir/server.pem" \
-       --x509keyfile "$srcdir/server-key.pem"
+tlsproxy_background 4711
+server_background --x509certfile "$srcdir/server.pem" \
+                  --x509keyfile "$srcdir/server-key.pem"
 wait_for_ports 4711 4712
 
 
@@ -70,8 +70,9 @@ test_no_invalid_certificate
 # Stop server and try a "MITM" with a bad certificate.
 echo
 kill $pid_server || echo 'failed to kill gnutls-serv'
-server --x509certfile "$srcdir/server-bad.pem" \
-       --x509keyfile "$srcdir/server-key.pem"
+sleep 3 # necessary on some systems like OpenBSD
+server_background --x509certfile "$srcdir/server-bad.pem" \
+                  --x509keyfile "$srcdir/server-key.pem"
 wait_for_ports 4712
 rm -f certificate-localhost-proxy.pem certificate-localhost-server.pem
 
@@ -109,7 +110,7 @@ test_proxy_successful
 test_invalid_certificate
 
 
-stop_servers
+# stop_servers in trap-handler
 cleanup
 
 exit 0