mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-19 19:42:30 +02:00
Code

t_net.sh: make bash dep explicit and run only if SITNL is compiled

Browse Source 
The t_net script currently has #!/bin/sh but it implicitly assume to
be using bash.
This is fine on most distros, but some do not have sh pointing to bash
by default, thus breaking the script.
Explicitly use bash to avoid failures.

On the other hand, run this unit-test only if SITNL was enabled at
compile time. This test was designed with SITNL in mind and it is
not yet ready for other backends.

Running only when SITNL is enabled implies running on Linux only
therefore we are guaranteed that bash will always work.

While at it, also add a comment as of why the t_client.rc file is
sourced.

Signed-off-by: Antonio Quartulli <antonio@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20190615230213.14888-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18547.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Antonio Quartulli 2019-06-16 01:02:12 +02:00 committed by Gert Doering
parent bebd25a0e3
commit 1e894662c6
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -1226,11 +1226,14 @@ else
enable_plugin_down_root="no"
fi
AM_CONDITIONAL([HAVE_SITNL], [false])
if test "${enable_iproute2}" = "yes"; then
test -z "${IPROUTE}" && AC_MSG_ERROR([ip utility is required but missing])
AC_DEFINE([ENABLE_IPROUTE], [1], [enable iproute2 support])
else if test "${have_sitnl}" = "yes"; then
AC_DEFINE([ENABLE_SITNL], [1], [enable sitnl support])
AM_CONDITIONAL([HAVE_SITNL], [true])
else if test "${WIN32}" != "yes" -a "${have_sitnl}" != "yes"; then
test -z "${ROUTE}" && AC_MSG_ERROR([route utility is required but missing])
test -z "${IFCONFIG}" && AC_MSG_ERROR([ifconfig utility is required but missing])

7
tests/Makefile.am
View File

@ -14,9 +14,10 @@ MAINTAINERCLEANFILES = \
SUBDIRS = unit_tests
test_scripts = t_net.sh
test_scripts += t_client.sh
test_scripts += t_lpback.sh t_cltsrv.sh
test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh
if HAVE_SITNL
test_scripts += t_net.sh
endif
TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)"
TESTS = $(test_scripts)

3
tests/t_net.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
IFACE="dummy0"
UNIT_TEST="./unit_tests/openvpn/networking_testdriver"
@ -74,6 +74,7 @@ run_test()
## execution starts here
# t_client.rc required only for RUN_SUDO definition
if [ -r "${top_builddir}"/t_client.rc ]; then
. "${top_builddir}"/t_client.rc
elif [ -r "${srcdir}"/t_client.rc ]; then

2
tests/unit_tests/openvpn/Makefile.am
View File

@ -14,7 +14,7 @@ endif
TESTS = $(test_binaries)
check_PROGRAMS = $(test_binaries)
if TARGET_LINUX
if HAVE_SITNL
check_PROGRAMS += networking_testdriver
endif