denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unit-tests: Rename targets for libstrongswan and kernel-netlink

Browse Source 
libstrongswan and kernel-netlink are the only two components which do
not adhere to the naming scheme used for all other tests. If the tests
are run by an external application this imposes problems due to clashing
names.

Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
This commit is contained in:
Thomas Egerer
2017-11-09 09:11:42 +01:00
committed by Tobias Brunner
parent 1c4b392a5b
commit 9cc61baaf5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/kernel_netlink/Makefile.am
+5 -5
View File
@@ -25,22 +25,22 @@ libstrongswan_kernel_netlink_la_LIBADD = $(DLLIB)
libstrongswan_kernel_netlink_la_LDFLAGS = -module -avoid-version libstrongswan_kernel_netlink_la_LDFLAGS = -module -avoid-version
TESTS = tests TESTS = kernel_netlink_tests
check_PROGRAMS = $(TESTS) check_PROGRAMS = $(TESTS)
tests_SOURCES = \ kernel_netlink_tests_SOURCES = \
tests.h tests.c \ tests.h tests.c \
suites/test_socket.c \ suites/test_socket.c \
kernel_netlink_shared.c kernel_netlink_shared.c
tests_CFLAGS = \ kernel_netlink_tests_CFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libstrongswan/tests \ -I$(top_srcdir)/src/libstrongswan/tests \
-DNETLINK_MSG_LOSS_HOOK=netlink_msg_loss \ -DNETLINK_MSG_LOSS_HOOK=netlink_msg_loss \
@COVERAGE_CFLAGS@ @COVERAGE_CFLAGS@
tests_LDFLAGS = @COVERAGE_LDFLAGS@ kernel_netlink_tests_LDFLAGS = @COVERAGE_LDFLAGS@
tests_LDADD = \ kernel_netlink_tests_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libstrongswan/tests/libtest.la $(top_builddir)/src/libstrongswan/tests/libtest.la
src/libstrongswan/tests/Makefile.am
+5 -5
View File
@@ -15,11 +15,11 @@ libtest_la_LIBADD = \
$(PTHREADLIB) $(ATOMICLIB) $(PTHREADLIB) $(ATOMICLIB)
TESTS = tests TESTS = libstrongswan_tests
check_PROGRAMS = $(TESTS) check_PROGRAMS = $(TESTS)
tests_SOURCES = tests.h tests.c \ libstrongswan_tests_SOURCES = tests.h tests.c \
suites/test_linked_list.c \ suites/test_linked_list.c \
suites/test_enumerator.c \ suites/test_enumerator.c \
suites/test_linked_list_enumerator.c \ suites/test_linked_list_enumerator.c \
@@ -59,14 +59,14 @@ tests_SOURCES = tests.h tests.c \
suites/test_ed25519.c \ suites/test_ed25519.c \
suites/test_signature_params.c suites/test_signature_params.c
tests_CFLAGS = \ libstrongswan_tests_CFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libstrongswan/tests \ -I$(top_srcdir)/src/libstrongswan/tests \
-DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \ -DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \
-DPLUGINS=\""${s_plugins}\"" \ -DPLUGINS=\""${s_plugins}\"" \
@COVERAGE_CFLAGS@ @COVERAGE_CFLAGS@
tests_LDFLAGS = @COVERAGE_LDFLAGS@ libstrongswan_tests_LDFLAGS = @COVERAGE_LDFLAGS@
tests_LDADD = \ libstrongswan_tests_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
libtest.la libtest.la