X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Fcommon.sh;h=c7cb7d1631cf8ff04f7894d2cd7253713411faf5;hb=ea87309935747eebc7cf8f5b46ed37975d1ebb09;hp=893eec1fa2315b26c1f7bac79b169499a84180cc;hpb=de03b92112c497bb5d1d468a240da12ea0605e60;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/common.sh b/tests/common.sh
index 893eec1..c7cb7d1 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -27,7 +27,7 @@ trap 'abort SIGINT' INT
 
 cleanup() {
     rm -f \
-        tmp tlsproxy-log \
+        tmp tlsproxy-log gnutls-serv-log \
         certificate-localhost-proxy.pem certificate-localhost-server.pem
 }
 stop_servers() {
@@ -48,6 +48,7 @@ tlsproxy_setup() {
     # present.
     if test -f proxy-ca-key.pem &&
             test -f proxy-ca.pem &&
+            test -f proxy-dh.pem &&
             test -f proxy-invalid.pem &&
             test -f proxy-key.pem
     then
@@ -61,19 +62,19 @@ tlsproxy_add() {
     # over when using `cp`. This causes a check failure when tlsproxy_add() is
     # called again with the same hostname. Instead use redirection which
     # doesn't use `cp`.
-    "$srcdir/../src/tlsproxy-add" "$1" < "$srcdir/$2" >/dev/null 2>&1
+    "$srcdir/../src/tlsproxy-add" "$1" <"$srcdir/$2" >/dev/null 2>&1
 }
-tlsproxy() {
+tlsproxy_background() {
     #valgrind --leak-check=full --error-exitcode=1 --track-fds=yes \
-    ../src/tlsproxy -d2 "$@" >tlsproxy-log 2>&1 &
+    ../src/tlsproxy -d3 "$@" >tlsproxy-log 2>&1 &
     pid_tlsproxy=$!
 }
-server() {
-    gnutls-serv --http --port 4712 "$@" >/dev/null 2>&1 &
+server_background() {
+    gnutls-serv --http --port 4712 --debug 10 "$@" >gnutls-serv-log 2>&1 &
     pid_server=$!
 }
 client() {
-    ./client ./proxy-ca.pem "$@" > tmp 2>&1
+    ./client ./proxy-ca.pem "$@" >tmp 2>&1
 }
 
 wait_for_ports() {