]> ruderich.org/simon Gitweb - tlsproxy/tlsproxy.git/commitdiff
tests/common.sh: Don't remove proxy-*.pem after each test.
authorSimon Ruderich <simon@ruderich.org>
Thu, 8 Aug 2013 16:42:27 +0000 (18:42 +0200)
committerSimon Ruderich <simon@ruderich.org>
Thu, 8 Aug 2013 16:42:27 +0000 (18:42 +0200)
Running `tlsproxy-setup` takes quite some time. Don't rerun it on each
test run, just reuse the files from the first run.

tests/common.sh

index 2d871083db7a31b5a9f11535c6e982c4db960544..893eec1fa2315b26c1f7bac79b169499a84180cc 100644 (file)
@@ -28,8 +28,7 @@ trap 'abort SIGINT' INT
 cleanup() {
     rm -f \
         tmp tlsproxy-log \
 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
 }
 stop_servers() {
     if test -n "$pid_server"; then
@@ -45,6 +44,16 @@ abort() {
     exit 1
 }
 tlsproxy_setup() {
     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() {
     "$srcdir/../src/tlsproxy-setup" >/dev/null 2>&1
 }
 tlsproxy_add() {