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 ae2d7aee20361bc3f0f212c56a33ee6277c2d24c..31c27cd0d31ea941621687dca4b75cfb6cd64a7e 100644 (file)
--- 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 4185fbfcf700e9e35c68a22e117a983eca4f8a14..6db932d8734ea9bc876d98b0617b66e6a01a8d92 100755 (executable)
--- 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 385e551eb6ad818e96d79b784f3f27c325502619..90d93ef68b63f2053cfeba3371ee461b3f136f74 100755 (executable)
--- 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 f66ceb14bb62644c71f55b66fcfa65b8fcd399bf..0608bb293ab9b43f5a2f4a4941db1028676294a0 100755 (executable)
--- 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 8a0e309d9d1a537ef9e502165fd6cfafeadf73fc..52bcb4d12c2da0a33724bb72beb96ebc0ca4a51b 100755 (executable)
--- 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