X-Git-Url: https://ruderich.org/simon/gitweb/?p=tlsproxy%2Ftlsproxy.git;a=blobdiff_plain;f=tests%2Fcommon.sh;h=74165f658b1ece7b32056e6de6bb3a3c2783cde4;hp=3649f71cb9d4b469370d65a0fe5d57a3d50949cc;hb=7eba49d24d56288d83746f3f0ce383d7c0c36552;hpb=9f38c8cb636332e9b5b5f8bd0d6408c72eb68e2e diff --git a/tests/common.sh b/tests/common.sh index 3649f71..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() { @@ -66,11 +66,11 @@ tlsproxy_add() { } 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_background() { - gnutls-serv --http --port 4712 "$@" >/dev/null 2>&1 & + gnutls-serv --http --port 4712 --debug 10 "$@" >gnutls-serv-log 2>&1 & pid_server=$! } client() {