# 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
cleanup() {
rm -f \
- tmp tlsproxy-log \
- certificate-localhost-proxy.pem certificate-localhost-server.pem \
- proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
+ tmp tlsproxy-log gnutls-serv-log \
+ certificate-localhost-proxy.pem certificate-localhost-server.pem
}
stop_servers() {
if test -n "$pid_server"; then
exit 1
}
tlsproxy_setup() {
+ # Don't waste time running `tlsproxy-setup` when all files are still
+ # 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
+ return
+ fi
+
"$srcdir/../src/tlsproxy-setup" >/dev/null 2>&1
}
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() {
- while :; do
+ for x in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
sleep 1
# Check if each given port can be reached.