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

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

diff --git a/tests/common.sh b/tests/common.sh
index 893eec1fa2315b26c1f7bac79b169499a84180cc..b72cafb753bee653a750694335d1e623b1f2f19b 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -48,6 +48,7 @@ tlsproxy_setup() {
     # 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
@@ -63,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=$!
 }