system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-09 04:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Haller 2016-10-15 22:28:34 +02:00
parent b2d4180787
commit b48b56c499
6 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Makefile.am
View File

@ -2180,8 +2180,45 @@ check-local-symbols-settings-ifnet: src/settings/plugins/ifnet/libnm-settings-pl
check_local += check-local-symbols-settings-ifnet
###############################################################################
check_programs += src/settings/plugins/ifnet/tests/test-ifnet
src_settings_plugins_ifnet_tests_test_ifnet_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$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings/plugins/ifnet \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-DTEST_IFNET_DIR=\"$(abs_srcdir)/src/settings/plugins/ifnet/tests\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifnet/tests/\" \
-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/src/settings/plugins/ifnet/tests/wpa_supplicant.conf"' \
-DSYSCONFDIR=\"nonexistent\"
src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS = \
$(GLIB_LDFLAGS)
$(CODE_COVERAGE_LDFLAGS)
src_settings_plugins_ifnet_tests_test_ifnet_LDADD = \
src/settings/plugins/ifnet/libnms-ifnet-core.la \
src/libNetworkManager.la
endif
EXTRA_DIST += \
src/settings/plugins/ifnet/tests/net \
src/settings/plugins/ifnet/tests/net.all \
src/settings/plugins/ifnet/tests/nm-system-settings.conf \
src/settings/plugins/ifnet/tests/wpa_supplicant.conf \
src/settings/plugins/ifnet/tests/test_ca_cert.pem
###############################################################################
girdir = $(datadir)/gir-1.0
@ -2245,6 +2282,8 @@ EXTRA_DIST += \
tools/test-sudo-wrapper.sh \
tools/enums-to-docbook.pl \
\
src/settings/plugins/README \
\
$(NULL)
BUILT_SOURCES += \

3
configure.ac
View File

@ -1140,9 +1140,6 @@ src/tests/config/Makefile
src/dnsmasq-manager/tests/Makefile
src/supplicant-manager/tests/Makefile
src/supplicant-manager/tests/certs/Makefile
src/settings/plugins/Makefile
src/settings/plugins/ifnet/Makefile
src/settings/plugins/ifnet/tests/Makefile
src/platform/Makefile
src/platform/tests/Makefile
src/rdisc/Makefile

1
src/Makefile.am
View File

@ -1,5 +1,4 @@
SUBDIRS = \
settings/plugins \
devices/adsl
if WITH_MODEM_MANAGER_1

7
src/settings/plugins/Makefile.am
View File

@ -1,7 +0,0 @@
SUBDIRS=
@GNOME_CODE_COVERAGE_RULES@
if CONFIG_PLUGIN_IFNET
SUBDIRS+=ifnet
endif

1
src/settings/plugins/ifnet/Makefile.am
View File

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

47
src/settings/plugins/ifnet/tests/Makefile.am
View File

@ -1,47 +0,0 @@
if ENABLE_TESTS
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS= \
-I$(srcdir)/../ \
-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$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(CHECK_CFLAGS) \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-DTEST_IFNET_DIR=\"$(abs_srcdir)\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"' \
-DSYSCONFDIR=\"nonexistent\"
noinst_PROGRAMS = test-ifnet
test_ifnet_SOURCES = \
test-ifnet.c
test_ifnet_LDFLAGS = \
$(GLIB_LDFLAGS)
$(CODE_COVERAGE_LDFLAGS)
test_ifnet_LDADD = \
$(top_builddir)/src/settings/plugins/ifnet/libnms-ifnet-core.la \
$(top_builddir)/src/libNetworkManager.la
@NM_LOG_COMPILER@
TESTS = test-ifnet
endif
EXTRA_DIST = \
net \
net.all \
nm-system-settings.conf \
wpa_supplicant.conf \
test_ca_cert.pem