Minor code cleanup.

[tlsproxy/tlsproxy.git] / tests / common.sh

diff --git a/tests/common.sh b/tests/common.sh
index 3f046fb08b89ac88f0f7c3e435e20e724c1bf633..3b08d53da77e4d286b6d17438be64c7feb6d5599 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -1,6 +1,6 @@
 # Functions used by all tests.
 #
-# Copyright (C) 2011-2012  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,19 +16,25 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+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
 }
-abort() {
-    echo abort
+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
@@ -47,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
 }