X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Fcommon.sh;h=3649f71cb9d4b469370d65a0fe5d57a3d50949cc;hb=9f38c8cb636332e9b5b5f8bd0d6408c72eb68e2e;hp=68ff879f5fcee26b14c06471147e9d4894d67980;hpb=219d904b7d12173ee93d016fe1a2cb8ae32eea9c;p=tlsproxy%2Ftlsproxy.git diff --git a/tests/common.sh b/tests/common.sh index 68ff879..3649f71 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -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 & pid_tlsproxy=$! } -server() { +server_background() { gnutls-serv --http --port 4712 "$@" >/dev/null 2>&1 & pid_server=$! } client() { - ./client ./proxy-ca.pem "$@" > tmp 2>&1 + ./client ./proxy-ca.pem "$@" >tmp 2>&1 } wait_for_ports() {