X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Fcommon.sh;h=68ff879f5fcee26b14c06471147e9d4894d67980;hb=4e681c928ad841753492b761ab1dbeb257341919;hp=2d871083db7a31b5a9f11535c6e982c4db960544;hpb=5d7fb12f931f04e29100e690ba06486f5d3be0b7;p=tlsproxy%2Ftlsproxy.git diff --git a/tests/common.sh b/tests/common.sh index 2d87108..68ff879 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,17 @@ 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-dh.pem && + test -f proxy-invalid.pem && + test -f proxy-key.pem + then + return + fi + "$srcdir/../src/tlsproxy-setup" >/dev/null 2>&1 } tlsproxy_add() {