X-Git-Url: https://ruderich.org/simon/gitweb/?p=tlsproxy%2Ftlsproxy.git;a=blobdiff_plain;f=tests%2Fcommon.sh;h=74165f658b1ece7b32056e6de6bb3a3c2783cde4;hp=68ff879f5fcee26b14c06471147e9d4894d67980;hb=7eba49d24d56288d83746f3f0ce383d7c0c36552;hpb=219d904b7d12173ee93d016fe1a2cb8ae32eea9c

diff --git a/tests/common.sh b/tests/common.sh
index 68ff879..74165f6 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -1,6 +1,6 @@
 # Functions used by all tests.
 #
-# Copyright (C) 2011-2013  Simon Ruderich
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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() {
@@ -62,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() {