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: fixes for the networking test script

Browse Source 
1) Building the networking unit-test when SITNL is not enabled does not
make much sense right now.
Make compilation dependent on having SITNL configured.

2) Remove some no-op mock_msg function calls.

3) Remove obsolete comment and declarations

Signed-off-by: Antonio Quartulli <antonio@openvpn.net>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20190618163435.26431-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18556.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Antonio Quartulli 2019-06-18 18:34:35 +02:00 committed by Gert Doering
parent 22020547cb
commit 06f65a0cbf
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/t_net.sh
View File

@ -4,9 +4,6 @@ IFACE="dummy0"
UNIT_TEST="./unit_tests/openvpn/networking_testdriver"
MAX_TEST=${1:-7}
KILL_EXEC=`which kill`
CC=${CC:-gcc}
srcdir="${srcdir:-.}"
top_builddir="${top_builddir:-..}"
openvpn="${top_builddir}/src/openvpn/openvpn"
@ -99,8 +96,7 @@ fi
# Ensure PREFER_KSU is in a known state
PREFER_KSU="${PREFER_KSU:-0}"
# make sure we have permissions to run ifconfig/route from OpenVPN
# can't use "id -u" here - doesn't work on Solaris
# make sure we have permissions to run the networking unit-test
ID=`id`
if expr "$ID" : "uid=0" >/dev/null
then :

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

@ -78,6 +78,7 @@ tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c mock_msg.h \
$(openvpn_srcdir)/platform.c \
$(openvpn_srcdir)/run_command.c
if HAVE_SITNL
networking_testdriver_CFLAGS = @TEST_CFLAGS@ \
-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \
$(OPTIONAL_CRYPTO_CFLAGS)
@ -92,3 +93,4 @@ networking_testdriver_SOURCES = test_networking.c mock_msg.c \
$(openvpn_srcdir)/otime.c \
$(openvpn_srcdir)/packet_id.c \
$(openvpn_srcdir)/platform.c
endif

16
tests/unit_tests/openvpn/test_networking.c
View File

@ -2,13 +2,9 @@
#include "syshead.h"
#include "networking.h"
#include "mock_msg.h"
static char *iface = "dummy0";
#ifdef ENABLE_SITNL
static int
net__iface_up(bool up)
{
@ -177,8 +173,6 @@ main(int argc, char *argv[])
{
int test;
mock_set_debug_level(10);
if (argc < 2)
{
usage(argv[0]);
@ -223,13 +217,3 @@ main(int argc, char *argv[])
usage(argv[0]);
return -1;
}
#else
int
main(int argc, char *argv[])
{
return 0;
}
#endif /* ENABLE_SITNL */