mirror of
https://github.com/OpenVPN/openvpn.git
synced 2024-09-20 03:52:28 +02:00
t_net.sh: fixes for the networking test script
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:
parent
22020547cb
commit
06f65a0cbf
@ -4,9 +4,6 @@ IFACE="dummy0"
|
|||||||
UNIT_TEST="./unit_tests/openvpn/networking_testdriver"
|
UNIT_TEST="./unit_tests/openvpn/networking_testdriver"
|
||||||
MAX_TEST=${1:-7}
|
MAX_TEST=${1:-7}
|
||||||
|
|
||||||
KILL_EXEC=`which kill`
|
|
||||||
CC=${CC:-gcc}
|
|
||||||
|
|
||||||
srcdir="${srcdir:-.}"
|
srcdir="${srcdir:-.}"
|
||||||
top_builddir="${top_builddir:-..}"
|
top_builddir="${top_builddir:-..}"
|
||||||
openvpn="${top_builddir}/src/openvpn/openvpn"
|
openvpn="${top_builddir}/src/openvpn/openvpn"
|
||||||
@ -99,8 +96,7 @@ fi
|
|||||||
# Ensure PREFER_KSU is in a known state
|
# Ensure PREFER_KSU is in a known state
|
||||||
PREFER_KSU="${PREFER_KSU:-0}"
|
PREFER_KSU="${PREFER_KSU:-0}"
|
||||||
|
|
||||||
# make sure we have permissions to run ifconfig/route from OpenVPN
|
# make sure we have permissions to run the networking unit-test
|
||||||
# can't use "id -u" here - doesn't work on Solaris
|
|
||||||
ID=`id`
|
ID=`id`
|
||||||
if expr "$ID" : "uid=0" >/dev/null
|
if expr "$ID" : "uid=0" >/dev/null
|
||||||
then :
|
then :
|
||||||
|
@ -78,6 +78,7 @@ tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c mock_msg.h \
|
|||||||
$(openvpn_srcdir)/platform.c \
|
$(openvpn_srcdir)/platform.c \
|
||||||
$(openvpn_srcdir)/run_command.c
|
$(openvpn_srcdir)/run_command.c
|
||||||
|
|
||||||
|
if HAVE_SITNL
|
||||||
networking_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
networking_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||||
-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \
|
-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \
|
||||||
$(OPTIONAL_CRYPTO_CFLAGS)
|
$(OPTIONAL_CRYPTO_CFLAGS)
|
||||||
@ -92,3 +93,4 @@ networking_testdriver_SOURCES = test_networking.c mock_msg.c \
|
|||||||
$(openvpn_srcdir)/otime.c \
|
$(openvpn_srcdir)/otime.c \
|
||||||
$(openvpn_srcdir)/packet_id.c \
|
$(openvpn_srcdir)/packet_id.c \
|
||||||
$(openvpn_srcdir)/platform.c
|
$(openvpn_srcdir)/platform.c
|
||||||
|
endif
|
||||||
|
@ -2,13 +2,9 @@
|
|||||||
#include "syshead.h"
|
#include "syshead.h"
|
||||||
#include "networking.h"
|
#include "networking.h"
|
||||||
|
|
||||||
#include "mock_msg.h"
|
|
||||||
|
|
||||||
|
|
||||||
static char *iface = "dummy0";
|
static char *iface = "dummy0";
|
||||||
|
|
||||||
#ifdef ENABLE_SITNL
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
net__iface_up(bool up)
|
net__iface_up(bool up)
|
||||||
{
|
{
|
||||||
@ -177,8 +173,6 @@ main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
int test;
|
int test;
|
||||||
|
|
||||||
mock_set_debug_level(10);
|
|
||||||
|
|
||||||
if (argc < 2)
|
if (argc < 2)
|
||||||
{
|
{
|
||||||
usage(argv[0]);
|
usage(argv[0]);
|
||||||
@ -223,13 +217,3 @@ main(int argc, char *argv[])
|
|||||||
usage(argv[0]);
|
usage(argv[0]);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
int
|
|
||||||
main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* ENABLE_SITNL */
|
|
||||||
|
Loading…
Reference in New Issue
Block a user