From: Daniel Lenski <dlenski@gmail.com>
Date: Fri, 26 Mar 2021 17:46:08 +0000 (-0700)
Subject: set OCCTL_SOCKET in tests/common.sh, if unset
X-Git-Tag: v8.20~347^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7846b4ad1a25a46a1367cad05875794351d05b39;p=users%2Fdwmw2%2Fopenconnect.git

set OCCTL_SOCKET in tests/common.sh, if unset

This way, individual test scripts don't need to all set it identically.

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
---

diff --git a/tests/common.sh b/tests/common.sh
index ae2d7aee..31c27cd0 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -38,6 +38,7 @@ export SOCKET_WRAPPER_DIR=$SOCKDIR
 export SOCKET_WRAPPER_DEFAULT_IFACE=2
 ADDRESS=127.0.0.$SOCKET_WRAPPER_DEFAULT_IFACE
 OPENCONNECT="${OPENCONNECT:-${top_builddir}/openconnect}"${EXEEXT}
+OCCTL_SOCKET="${OCCTL_SOCKET:-./occtl-comp-$$.socket}"
 
 certdir="${srcdir}/certs"
 confdir="${srcdir}/configs"
diff --git a/tests/dtls-psk b/tests/dtls-psk
index 4185fbfc..6db932d8 100755
--- a/tests/dtls-psk
+++ b/tests/dtls-psk
@@ -63,7 +63,6 @@ VPNNET=192.168.2.0/24
 VPNADDR=192.168.2.1
 VPNNET6=fd91:6d87:7341:dc6a::/112
 VPNADDR6=fd91:6d87:7341:dc6a::1
-OCCTL_SOCKET=./occtl-comp-$$.socket
 USERNAME=test
 TUNDEV=oc-$$-tun0
 
diff --git a/tests/obsolete-server-crypto b/tests/obsolete-server-crypto
index 385e551e..90d93ef6 100755
--- a/tests/obsolete-server-crypto
+++ b/tests/obsolete-server-crypto
@@ -20,7 +20,6 @@
 # This test uses LD_PRELOAD
 PRELOAD=1
 SERV="${SERV:-../src/ocserv}"
-OCCTL_SOCKET=./occtl-comp-$$.socket
 srcdir=${srcdir:-.}
 top_builddir=${top_builddir:-..}
 
diff --git a/tests/pfs b/tests/pfs
index f66ceb14..0608bb29 100755
--- a/tests/pfs
+++ b/tests/pfs
@@ -20,7 +20,6 @@
 # This test uses LD_PRELOAD
 PRELOAD=1
 SERV="${SERV:-../src/ocserv}"
-OCCTL_SOCKET=./occtl-comp-$$.socket
 srcdir=${srcdir:-.}
 top_builddir=${top_builddir:-..}
 
diff --git a/tests/sigterm b/tests/sigterm
index 8a0e309d..52bcb4d1 100755
--- a/tests/sigterm
+++ b/tests/sigterm
@@ -66,7 +66,6 @@ VPNNET=192.168.3.0/24
 VPNADDR=192.168.3.1
 VPNNET6=fd91:6d87:8341:dc6a::/112
 VPNADDR6=fd91:6d87:8341:dc6a::1
-OCCTL_SOCKET=./occtl-comp-$$.socket
 USERNAME=test
 TUNDEV=oc-$$-tun0