fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 13:10:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: merge "src/settings/plugins/ifupdown/tests/Makefile.am" into toplevel Makefile

Browse source
This commit is contained in:
Thomas Haller 2016-10-17 19:10:03 +02:00
parent 4128d837ac
commit b661b17687
5 changed files with 50 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Makefile.am
View file

@ -2072,8 +2072,58 @@ check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-setti
check_local += check-local-symbols-settings-ifupdown
###############################################################################
check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown
src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/src/settings/plugins/ifupdown \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\"
src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
$(GLIB_LDFLAGS)
$(CODE_COVERAGE_LDFLAGS)
src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \
src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
src/libNetworkManager.la
endif
EXTRA_DIST += \
src/settings/plugins/ifupdown/tests/test1 \
src/settings/plugins/ifupdown/tests/test2 \
src/settings/plugins/ifupdown/tests/test3 \
src/settings/plugins/ifupdown/tests/test4 \
src/settings/plugins/ifupdown/tests/test5 \
src/settings/plugins/ifupdown/tests/test6 \
src/settings/plugins/ifupdown/tests/test7 \
src/settings/plugins/ifupdown/tests/test8 \
src/settings/plugins/ifupdown/tests/test9 \
src/settings/plugins/ifupdown/tests/test11 \
src/settings/plugins/ifupdown/tests/test12 \
src/settings/plugins/ifupdown/tests/test13 \
src/settings/plugins/ifupdown/tests/test14 \
src/settings/plugins/ifupdown/tests/test15 \
src/settings/plugins/ifupdown/tests/test16 \
src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 \
src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 \
src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen \
src/settings/plugins/ifupdown/tests/test20-source-stanza \
src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \
src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \
src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \
src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d
###############################################################################
girdir = $(datadir)/gir-1.0

2
configure.ac
View file

@ -1141,8 +1141,6 @@ src/dnsmasq-manager/tests/Makefile
src/supplicant-manager/tests/Makefile
src/supplicant-manager/tests/certs/Makefile
src/settings/plugins/Makefile
src/settings/plugins/ifupdown/Makefile
src/settings/plugins/ifupdown/tests/Makefile
src/settings/plugins/ifnet/Makefile
src/settings/plugins/ifnet/tests/Makefile
src/platform/Makefile

4
src/settings/plugins/Makefile.am
View file

@ -2,10 +2,6 @@ SUBDIRS=
@GNOME_CODE_COVERAGE_RULES@
if CONFIG_PLUGIN_IFUPDOWN
SUBDIRS+=ifupdown
endif
if CONFIG_PLUGIN_IFNET
SUBDIRS+=ifnet
endif

1
src/settings/plugins/ifupdown/Makefile.am
View file

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

39
src/settings/plugins/ifupdown/tests/Makefile.am
View file

@ -1,39 +0,0 @@
if ENABLE_TESTS
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DTEST_ENI_DIR=\"$(abs_srcdir)\"
noinst_PROGRAMS = test-ifupdown
test_ifupdown_SOURCES = \
test-ifupdown.c
test_ifupdown_LDFLAGS = \
$(GLIB_LDFLAGS)
$(CODE_COVERAGE_LDFLAGS)
test_ifupdown_LDADD = \
$(top_builddir)/src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
$(top_builddir)/src/libNetworkManager.la
@NM_LOG_COMPILER@
TESTS = test-ifupdown
endif
EXTRA_DIST = \
test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \
test13 test14 test15 test16 test17-wired-static-verify-ip4 \
test18-wired-static-verify-ip6 test19-wired-static-verify-ip4-plen \
test20-source-stanza test20-source-stanza.eth0 test20-source-stanza.eth1 \
test21-source-dir-stanza test21-source-dir-stanza.d