tests: Cleanup.

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

diff --git a/tests/common.sh b/tests/common.sh
index 87781f2d0e165512a42537987dea03243eb1cdd3..3b08d53da77e4d286b6d17438be64c7feb6d5599 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -16,15 +16,21 @@
 # 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() {
@@ -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
 }