system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-08 19:55:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: merge "src/dhcp-manager/tests/Makefile.am" into toplevel Makefile

Browse Source
This commit is contained in:
Thomas Haller 2016-10-15 19:59:09 +02:00
parent 481d2165e9
commit 815624bf24
5 changed files with 46 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Makefile.am
View File

@ -1497,6 +1497,52 @@ src_dhcp_manager_nm_dhcp_helper_LDFLAGS = \
src_dhcp_manager_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
###############################################################################
# src/dhcp-manager/tests
###############################################################################
if ENABLE_TESTS
src_dhcp_manager_tests_cppflags = \
-I$(top_srcdir)/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I$(top_srcdir)/src/dhcp-manager \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)/src/dhcp-manager/tests\""
src_dhcp_manager_tests_ldadd = \
src/libNetworkManager.la
src_dhcp_manager_tests_programs = \
src/dhcp-manager/tests/test-dhcp-dhclient \
src/dhcp-manager/tests/test-dhcp-utils
noinst_PROGRAMS += $(src_dhcp_manager_tests_programs)
src_dhcp_manager_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_manager_tests_cppflags)
src_dhcp_manager_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_manager_tests_cppflags)
src_dhcp_manager_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_manager_tests_ldadd)
src_dhcp_manager_tests_test_dhcp_utils_LDADD = $(src_dhcp_manager_tests_ldadd)
TESTS += $(src_dhcp_manager_tests_programs)
endif
EXTRA_DIST += \
src/dhcp-manager/tests/test-dhclient-duid.leases \
src/dhcp-manager/tests/test-dhclient-commented-duid.leases \
src/dhcp-manager/tests/leases/basic.leases \
src/dhcp-manager/tests/leases/malformed1.leases \
src/dhcp-manager/tests/leases/malformed2.leases \
src/dhcp-manager/tests/leases/malformed3.leases
###############################################################################
girdir = $(datadir)/gir-1.0

2
configure.ac
View File

@ -1137,8 +1137,6 @@ shared/nm-version-macros.h
src/Makefile
src/tests/Makefile
src/tests/config/Makefile
src/dhcp-manager/Makefile
src/dhcp-manager/tests/Makefile
src/dnsmasq-manager/tests/Makefile
src/supplicant-manager/tests/Makefile
src/supplicant-manager/tests/certs/Makefile

2
src/Makefile.am
View File

@ -1,5 +1,4 @@
SUBDIRS = \
dhcp-manager \
ppp-manager \
settings/plugins \
devices/adsl
@ -18,7 +17,6 @@ endif
if ENABLE_TESTS
SUBDIRS += \
dhcp-manager/tests \
dnsmasq-manager/tests \
platform \
devices \

1
src/dhcp-manager/Makefile.am
View File

@ -1 +0,0 @@
SUBDIRS = tests

50
src/dhcp-manager/tests/Makefile.am
View File

@ -1,50 +0,0 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I$(top_srcdir)/src/dhcp-manager \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\""
noinst_PROGRAMS = \
test-dhcp-dhclient \
test-dhcp-utils
####### dhclient leases test #######
test_dhcp_dhclient_SOURCES = \
$(top_srcdir)/src/dhcp-manager/nm-dhcp-dhclient-utils.h \
$(top_srcdir)/src/dhcp-manager/nm-dhcp-dhclient-utils.c \
$(top_srcdir)/src/dhcp-manager/nm-dhcp-utils.h \
$(top_srcdir)/src/dhcp-manager/nm-dhcp-utils.c \
test-dhcp-dhclient.c
test_dhcp_dhclient_LDADD = \
$(top_builddir)/src/libNetworkManager.la
####### DHCP utils test #######
test_dhcp_utils_SOURCES = \
test-dhcp-utils.c
test_dhcp_utils_LDADD = \
$(top_builddir)/src/libNetworkManager.la
#################################
@NM_LOG_COMPILER@
TESTS = test-dhcp-dhclient test-dhcp-utils
EXTRA_DIST = \
test-dhclient-duid.leases \
test-dhclient-commented-duid.leases \
leases/basic.leases \
leases/malformed1.leases \
leases/malformed2.leases \
leases/malformed3.leases