From: Simon Ruderich <simon@ruderich.org>
Date: Thu, 8 Aug 2013 16:42:27 +0000 (+0200)
Subject: tests/common.sh: Don't remove proxy-*.pem after each test.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;ds=sidebyside;h=de03b92112c497bb5d1d468a240da12ea0605e60;hp=7fdcf05915e5ff1662fa38e7bd0e8c20fb8cb663;p=tlsproxy%2Ftlsproxy.git

tests/common.sh: Don't remove proxy-*.pem after each test.

Running `tlsproxy-setup` takes quite some time. Don't rerun it on each
test run, just reuse the files from the first run.
---

diff --git a/tests/common.sh b/tests/common.sh
index 2d87108..893eec1 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -28,8 +28,7 @@ trap 'abort SIGINT' INT
 cleanup() {
     rm -f \
         tmp tlsproxy-log \
-        certificate-localhost-proxy.pem certificate-localhost-server.pem \
-        proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
+        certificate-localhost-proxy.pem certificate-localhost-server.pem
 }
 stop_servers() {
     if test -n "$pid_server"; then
@@ -45,6 +44,16 @@ abort() {
     exit 1
 }
 tlsproxy_setup() {
+    # Don't waste time running `tlsproxy-setup` when all files are still
+    # present.
+    if test -f proxy-ca-key.pem &&
+            test -f proxy-ca.pem &&
+            test -f proxy-invalid.pem &&
+            test -f proxy-key.pem
+    then
+        return
+    fi
+
     "$srcdir/../src/tlsproxy-setup" >/dev/null 2>&1
 }
 tlsproxy_add() {