X-Git-Url: https://ruderich.org/simon/gitweb/?p=tlsproxy%2Ftlsproxy.git;a=blobdiff_plain;f=tests%2Fcommon.sh;h=893eec1fa2315b26c1f7bac79b169499a84180cc;hp=2d871083db7a31b5a9f11535c6e982c4db960544;hb=de03b92112c497bb5d1d468a240da12ea0605e60;hpb=7fdcf05915e5ff1662fa38e7bd0e8c20fb8cb663 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() {