upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-09 00:42:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make argv unit tests obey {MBEDTLS, OPENSSL}_{LIBS, CFLAGS}

Browse source 
Fixes builds that use MBEDTLS_CFLAGS and friends to tell the build where
the header files and libraries are.  Also alphabetically orders some of
the listed files in relates Makefile.am files.

Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1479152603-5103-1-git-send-email-steffan@karger.me>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13050.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Steffan Karger 2016-11-14 20:43:23 +01:00 committed by Gert Doering
parent 2536091244
commit ac42df1a2e
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -1298,10 +1298,10 @@ AC_CONFIG_FILES([
src/plugins/down-root/Makefile
tests/Makefile
tests/unit_tests/Makefile
tests/unit_tests/plugins/Makefile
tests/unit_tests/plugins/auth-pam/Makefile
tests/unit_tests/example_test/Makefile
tests/unit_tests/openvpn/Makefile
tests/unit_tests/plugins/Makefile
tests/unit_tests/plugins/auth-pam/Makefile
vendor/Makefile
sample/Makefile
doc/Makefile

2
tests/unit_tests/Makefile.am
View file

@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign
if CMOCKA_INITIALIZED
SUBDIRS = example_test plugins openvpn
SUBDIRS = example_test openvpn plugins
endif

6
tests/unit_tests/openvpn/Makefile.am
View file

@ -7,8 +7,10 @@ TESTS = $(check_PROGRAMS)
openvpn_srcdir = $(top_srcdir)/src/openvpn
compat_srcdir = $(top_srcdir)/src/compat
argv_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir)
argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line
argv_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) \
$(OPTIONAL_CRYPTO_CFLAGS)
argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line \
$(OPTIONAL_CRYPTO_LIBS)
argv_testdriver_SOURCES = test_argv.c \
$(openvpn_srcdir)/platform.c \
$(openvpn_srcdir)/buffer.c \