X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Fcommon.sh;h=c66fa55216815bb68861a71554db00958bd88a20;hb=2405001c22e3e9109a3640de8db4152b68ff922b;hp=769a78e8276b6a482928d02fb939520733a56fd8;hpb=d778944d0403b093d43d9cbd94bd298bfc3a8d42;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/common.sh b/tests/common.sh
index 769a78e..c66fa55 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -16,36 +16,51 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
+
 cleanup() {
     rm -f \
+        tmp \
         certificate-localhost-proxy.pem certificate-localhost-server.pem \
         proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
 }
+stop_servers() {
+    kill $pid_server || echo 'failed to kill gnutls-serv'
+    kill $pid_tlsproxy || echo 'failed to kill tlsproxy'
+}
 abort() {
-    echo abort
-    pkill -n gnutls-serv
-    pkill -n tlsproxy
+    echo "abort: $*"
+    stop_servers
     exit 1
 }
+tlsproxy() {
+    ../src/tlsproxy -d2 "$@" >/dev/null &
+    pid_tlsproxy=$!
+}
 server() {
-    gnutls-serv --http --port 4712 "$@" >/dev/null 2>/dev/null &
+    gnutls-serv --http --port 4712 "$@" >/dev/null 2>&1 &
+    pid_server=$!
 }
 client() {
     ./client ./proxy-ca.pem "$@" > tmp 2>&1
 }
 
 test_proxy_failure() {
-    grep 'proxy failure' tmp >/dev/null || abort
+    grep 'proxy failure' tmp >/dev/null \
+        || abort 'test_proxy_failure'
     grep 'response: HTTP/1.0 503 Forwarding failure' tmp >/dev/null \
-        || abort
+        || abort 'test_proxy_failure 2'
 }
 test_proxy_successful() {
     grep 'response: HTTP/1.0 200 Connection established' tmp >/dev/null \
-        || abort
+        || abort 'test_proxy_successful'
 }
 test_invalid_certificate() {
-    grep 'certificate invalid' tmp >/dev/null || abort
+    grep 'certificate invalid' tmp >/dev/null \
+        || abort 'test_invalid_certificate'
 }
 test_no_invalid_certificate() {
-    grep 'certificate invalid' tmp >/dev/null && abort
+    grep 'certificate invalid' tmp >/dev/null \
+        && abort 'test_no_invalid_certificate' || true
 }