mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 10:46:59 +00:00
build: merge "src/rdisc/tests/Makefile.am" into toplevel Makefile
This commit is contained in:
parent
f3437707e3
commit
e52a5e1146
42
Makefile.am
42
Makefile.am
|
@ -27,6 +27,7 @@ TESTS =
|
||||||
BUILT_SOURCES =
|
BUILT_SOURCES =
|
||||||
GLIB_GENERATED =
|
GLIB_GENERATED =
|
||||||
check_programs =
|
check_programs =
|
||||||
|
check_programs_norun =
|
||||||
check_ltlibraries =
|
check_ltlibraries =
|
||||||
check_local =
|
check_local =
|
||||||
dbusservice_DATA =
|
dbusservice_DATA =
|
||||||
|
@ -2731,6 +2732,43 @@ src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags)
|
||||||
src_devices_tests_test_arping_LDADD = \
|
src_devices_tests_test_arping_LDADD = \
|
||||||
src/platform/tests/libnm-platform-tests.la
|
src/platform/tests/libnm-platform-tests.la
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# src/rdisc/tests
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
src_rdisc_tests_cppflags = \
|
||||||
|
-I${top_srcdir} \
|
||||||
|
-I$(top_srcdir)/shared \
|
||||||
|
-I$(top_builddir)/shared \
|
||||||
|
-I${top_srcdir}/src \
|
||||||
|
-I${top_srcdir}/src/platform \
|
||||||
|
-I${top_srcdir}/libnm-core \
|
||||||
|
-I${top_builddir}/libnm-core \
|
||||||
|
-I${srcdir}/src/rdisc \
|
||||||
|
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||||
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||||
|
$(GLIB_CFLAGS) \
|
||||||
|
$(CODE_COVERAGE_CFLAGS) \
|
||||||
|
$(LIBNDP_CFLAGS)
|
||||||
|
|
||||||
|
src_rdisc_tests_ldflags = \
|
||||||
|
$(CODE_COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
|
src_rdisc_tests_ldadd = \
|
||||||
|
src/libNetworkManagerTest.la \
|
||||||
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
|
check_programs += src/rdisc/tests/test-rdisc-fake
|
||||||
|
check_programs_norun += src/rdisc/tests/test-rdisc-linux
|
||||||
|
|
||||||
|
src_rdisc_tests_test_rdisc_linux_CPPFLAGS = $(src_rdisc_tests_cppflags)
|
||||||
|
src_rdisc_tests_test_rdisc_linux_LDFLAGS = $(src_rdisc_tests_flags)
|
||||||
|
src_rdisc_tests_test_rdisc_linux_LDADD = $(src_rdisc_tests_ldadd)
|
||||||
|
|
||||||
|
src_rdisc_tests_test_rdisc_fake_CPPFLAGS = $(src_rdisc_tests_cppflags)
|
||||||
|
src_rdisc_tests_test_rdisc_fake_LDFLAGS = $(src_rdisc_tests_flags)
|
||||||
|
src_rdisc_tests_test_rdisc_fake_LDADD = $(src_rdisc_tests_ldadd)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
girdir = $(datadir)/gir-1.0
|
girdir = $(datadir)/gir-1.0
|
||||||
|
@ -2745,10 +2783,10 @@ dbusservice_DATA += src/org.freedesktop.NetworkManager.conf
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
if ENABLE_TESTS
|
if ENABLE_TESTS
|
||||||
noinst_PROGRAMS += $(check_programs)
|
noinst_PROGRAMS += $(check_programs) $(check_programs_norun)
|
||||||
noinst_LTLIBRARIES += $(check_ltlibraries)
|
noinst_LTLIBRARIES += $(check_ltlibraries)
|
||||||
else
|
else
|
||||||
check_PROGRAMS += $(check_programs)
|
check_PROGRAMS += $(check_programs) $(check_programs_norun)
|
||||||
check_LTLIBRARIES += $(check_ltlibraries)
|
check_LTLIBRARIES += $(check_ltlibraries)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -1139,8 +1139,6 @@ src/tests/Makefile
|
||||||
src/tests/config/Makefile
|
src/tests/config/Makefile
|
||||||
src/supplicant-manager/tests/Makefile
|
src/supplicant-manager/tests/Makefile
|
||||||
src/supplicant-manager/tests/certs/Makefile
|
src/supplicant-manager/tests/certs/Makefile
|
||||||
src/rdisc/Makefile
|
|
||||||
src/rdisc/tests/Makefile
|
|
||||||
libnm/libnm.pc
|
libnm/libnm.pc
|
||||||
libnm-util/libnm-util.pc
|
libnm-util/libnm-util.pc
|
||||||
libnm-util/Makefile
|
libnm-util/Makefile
|
||||||
|
|
|
@ -2,7 +2,6 @@ SUBDIRS =
|
||||||
|
|
||||||
if ENABLE_TESTS
|
if ENABLE_TESTS
|
||||||
SUBDIRS += \
|
SUBDIRS += \
|
||||||
rdisc \
|
|
||||||
supplicant-manager/tests \
|
supplicant-manager/tests \
|
||||||
tests
|
tests
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
SUBDIRS = tests
|
|
|
@ -1,36 +0,0 @@
|
||||||
AM_CPPFLAGS = \
|
|
||||||
-I${top_srcdir} \
|
|
||||||
-I$(top_srcdir)/shared \
|
|
||||||
-I$(top_builddir)/shared \
|
|
||||||
-I${top_srcdir}/src \
|
|
||||||
-I${top_srcdir}/src/platform \
|
|
||||||
-I${top_srcdir}/libnm-core \
|
|
||||||
-I${top_builddir}/libnm-core \
|
|
||||||
-I${srcdir}/.. \
|
|
||||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
|
||||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
|
||||||
$(GLIB_CFLAGS) \
|
|
||||||
$(LIBNDP_CFLAGS)
|
|
||||||
|
|
||||||
AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
|
|
||||||
AM_LDFLAGS = \
|
|
||||||
$(GLIB_LIBS) \
|
|
||||||
$(CODE_COVERAGE_LDFLAGS)
|
|
||||||
|
|
||||||
@GNOME_CODE_COVERAGE_RULES@
|
|
||||||
|
|
||||||
noinst_PROGRAMS = test-rdisc-linux test-rdisc-fake
|
|
||||||
|
|
||||||
test_rdisc_linux_SOURCES = \
|
|
||||||
test-rdisc-linux.c
|
|
||||||
test_rdisc_linux_LDADD = \
|
|
||||||
$(top_builddir)/src/libNetworkManager.la
|
|
||||||
|
|
||||||
test_rdisc_fake_SOURCES = \
|
|
||||||
test-rdisc-fake.c
|
|
||||||
test_rdisc_fake_LDADD = \
|
|
||||||
$(top_builddir)/src/libNetworkManagerTest.la
|
|
||||||
|
|
||||||
@NM_LOG_COMPILER@
|
|
||||||
TESTS = test-rdisc-fake
|
|
||||||
|
|
Loading…
Reference in a new issue