tests: Rename tlsproxy() and server() to *_background().

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

diff --git a/tests/common.sh b/tests/common.sh
index 2d871083db7a31b5a9f11535c6e982c4db960544..b72cafb753bee653a750694335d1e623b1f2f19b 100644 (file)
--- 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() {
@@ -54,12 +64,12 @@ tlsproxy_add() {
     # doesn't use `cp`.
     "$srcdir/../src/tlsproxy-add" "$1" < "$srcdir/$2" >/dev/null 2>&1
 }
-tlsproxy() {
+tlsproxy_background() {
     #valgrind --leak-check=full --error-exitcode=1 --track-fds=yes \
     ../src/tlsproxy -d2 "$@" >tlsproxy-log 2>&1 &
     pid_tlsproxy=$!
 }
-server() {
+server_background() {
     gnutls-serv --http --port 4712 "$@" >/dev/null 2>&1 &
     pid_server=$!
 }