tests/common.sh: Simplify error redirection.

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

diff --git a/tests/common.sh b/tests/common.sh
index 05641db98ad8482141a03acc9f87ae64eef64f33..87781f2d0e165512a42537987dea03243eb1cdd3 100644 (file)
--- 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,6 +16,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+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
     pkill -n gnutls-serv
@@ -23,7 +28,7 @@ abort() {
     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