X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Ftests-normal.sh;h=57ce39a8a12b8dfbcd1797ee5b98fd147ed92386;hb=b7ce41b809a3b3533d398c0da8fd9787c149434c;hp=5967c44ba1ff6485d8ccf2dff9f3e3cff2fa1ba7;hpb=9fb20ff647d6d494d99184875d2c60586107d34c;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
index 5967c44..57ce39a 100755
--- a/tests/tests-normal.sh
+++ b/tests/tests-normal.sh
@@ -24,7 +24,7 @@ test "x$srcdir" = x && srcdir=.
 
 # Create necessary files.
 cleanup
-"$srcdir/../src/tlsproxy-setup" >/dev/null 2>/dev/null
+tlsproxy_setup
 
 # Normal tests.
 tlsproxy 4711
@@ -44,8 +44,7 @@ test_proxy_successful
 test_invalid_certificate
 
 # Create the proxy certificate.
-"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
-    >/dev/null 2>/dev/null
+tlsproxy_add localhost server.pem
 
 echo missing server certificate
 mv certificate-localhost-server.pem .pem
@@ -88,8 +87,7 @@ test_proxy_successful
 test_invalid_certificate
 
 # Create the proxy certificate.
-"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
-    >/dev/null 2>/dev/null
+tlsproxy_add localhost server.pem
 
 echo mitm missing server certificate
 mv certificate-localhost-server.pem .pem
@@ -111,7 +109,7 @@ test_proxy_successful
 test_invalid_certificate
 
 
-stop_servers
+# stop_servers in trap-handler
 cleanup
 
 exit 0