diff options
| -rw-r--r-- | Makefile.am | 36 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/devices/Makefile.am | 1 | ||||
| -rw-r--r-- | src/devices/tests/Makefile.am | 52 | ||||
| -rw-r--r-- | src/devices/tests/test-arping.c | 2 | ||||
| -rw-r--r-- | src/devices/tests/test-lldp.c | 2 |
7 files changed, 38 insertions, 58 deletions
diff --git a/Makefile.am b/Makefile.am index 8bf6af07bf..8246c38c00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2696,6 +2696,42 @@ src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la ############################################################################### +# src/devices/tests +############################################################################### + +src_devices_tests_cppflags = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/devices \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/src/platform/tests \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) + +src_devices_tests_ldflags = \ + $(CODE_COVERAGE_LDFLAGS) + +check_programs += \ + src/devices/tests/test-lldp \ + src/devices/tests/test-arping + +src_devices_tests_test_lldp_CPPFLAGS = $(src_devices_tests_cppflags) +src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags) +src_devices_tests_test_lldp_LDADD = \ + src/platform/tests/libnm-platform-tests.la + +src_devices_tests_test_arping_CPPFLAGS = $(src_devices_tests_cppflags) +src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags) +src_devices_tests_test_arping_LDADD = \ + src/platform/tests/libnm-platform-tests.la + +############################################################################### girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) diff --git a/configure.ac b/configure.ac index 742c904ab0..a9b30a126a 100644 --- a/configure.ac +++ b/configure.ac @@ -1141,8 +1141,6 @@ src/supplicant-manager/tests/Makefile src/supplicant-manager/tests/certs/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile -src/devices/Makefile -src/devices/tests/Makefile libnm/libnm.pc libnm-util/libnm-util.pc libnm-util/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 9d300e18db..c016f81d5b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = if ENABLE_TESTS SUBDIRS += \ - devices \ rdisc \ supplicant-manager/tests \ tests diff --git a/src/devices/Makefile.am b/src/devices/Makefile.am deleted file mode 100644 index 3c6155b9c6..0000000000 --- a/src/devices/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = tests diff --git a/src/devices/tests/Makefile.am b/src/devices/tests/Makefile.am deleted file mode 100644 index 7d6aa675e9..0000000000 --- a/src/devices/tests/Makefile.am +++ /dev/null @@ -1,52 +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/platform \ - -I$(top_srcdir)/src/devices \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) - -AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) -AM_LDFLAGS = $(GLIB_LIBS) $(CODE_COVERAGE_LDFLAGS) -DEVICES_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -@GNOME_CODE_COVERAGE_RULES@ - -noinst_PROGRAMS = \ - test-lldp \ - test-arping - -test_lldp_SOURCES = \ - test-lldp.c \ - ../nm-lldp-listener.c \ - $(top_srcdir)/src/platform/tests/test-common.c - -test_lldp_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src/platform/tests \ - -DSETUP=nm_linux_platform_setup - -test_lldp_LDADD = $(DEVICES_LDADD) - -test_arping_SOURCES = \ - test-arping.c \ - ../nm-arping-manager.c \ - $(top_srcdir)/src/platform/tests/test-common.c - -test_arping_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src/platform/tests \ - -DSETUP=nm_linux_platform_setup - -test_arping_LDADD = $(DEVICES_LDADD) - -@NM_LOG_COMPILER@ -TESTS = \ - test-lldp \ - test-arping diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c index 87561a7fcb..35bf749342 100644 --- a/src/devices/tests/test-arping.c +++ b/src/devices/tests/test-arping.c @@ -125,7 +125,7 @@ fixture_teardown (test_fixture *fixture, gconstpointer user_data) nm_platform_link_delete (NM_PLATFORM_GET, fixture->ifindex1); } -NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP; +NMTstpSetupFunc const _nmtstp_setup_platform_func = nm_linux_platform_setup; void _nmtstp_init_tests (int *argc, char ***argv) diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index 7fc090fea3..1fbab316e3 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -432,7 +432,7 @@ _test_recv_fixture_teardown (TestRecvFixture *fixture, gconstpointer user_data) /*****************************************************************************/ -NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP; +NMTstpSetupFunc const _nmtstp_setup_platform_func = nm_linux_platform_setup; void _nmtstp_init_tests (int *argc, char ***argv) |