X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Fcommon.sh;h=3b08d53da77e4d286b6d17438be64c7feb6d5599;hb=da1b95a8ded80fb5dc07e93a3a7538d39b59740e;hp=05641db98ad8482141a03acc9f87ae64eef64f33;hpb=c955255347f4ca514f26ad96a12524b38d235dee;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/common.sh b/tests/common.sh
index 05641db..3b08d53 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -1,6 +1,6 @@
 # Functions used by all tests.
 #
-# Copyright (C) 2011  Simon Ruderich
+# Copyright (C) 2011-2013  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
@@ -16,14 +16,25 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-abort() {
-    echo abort
+set -e
+
+
+cleanup() {
+    rm -f \
+        certificate-localhost-proxy.pem certificate-localhost-server.pem \
+        proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
+}
+stop_servers() {
     pkill -n gnutls-serv
     pkill -n tlsproxy
+}
+abort() {
+    echo abort
+    stop_servers
     exit 1
 }
 server() {
-    gnutls-serv --http --port 4712 "$@" >/dev/null 2>/dev/null &
+    gnutls-serv --http --port 4712 "$@" >/dev/null 2>&1 &
 }
 client() {
     ./client ./proxy-ca.pem "$@" > tmp 2>&1
@@ -42,5 +53,5 @@ test_invalid_certificate() {
     grep 'certificate invalid' tmp >/dev/null || abort
 }
 test_no_invalid_certificate() {
-    grep 'certificate invalid' tmp >/dev/null && abort
+    grep 'certificate invalid' tmp >/dev/null && abort || true
 }