mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 20:45:32 +00:00
build/trivial: rename VALGRIND_RULES in Makefile.am to NM_LOG_COMPILER
This commit is contained in:
parent
a54a3e8263
commit
274de2555b
|
@ -1070,8 +1070,8 @@ else
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
AS_IF([test "$with_valgrind" != "no"],
|
AS_IF([test "$with_valgrind" != "no"],
|
||||||
AC_SUBST(VALGRIND_RULES, 'LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions"),
|
AC_SUBST(NM_LOG_COMPILER, 'LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions"),
|
||||||
AC_SUBST(VALGRIND_RULES, []))
|
AC_SUBST(NM_LOG_COMPILER, []))
|
||||||
AM_CONDITIONAL(WITH_VALGRIND, test "${with_valgrind}" != "no")
|
AM_CONDITIONAL(WITH_VALGRIND, test "${with_valgrind}" != "no")
|
||||||
|
|
||||||
GTK_DOC_CHECK(1.0)
|
GTK_DOC_CHECK(1.0)
|
||||||
|
|
|
@ -26,7 +26,7 @@ test_dispatcher_envp_LDADD = \
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-dispatcher-envp
|
TESTS = test-dispatcher-envp
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -33,7 +33,7 @@ LDADD = \
|
||||||
$(top_builddir)/libnm-core/libnm-core.la \
|
$(top_builddir)/libnm-core/libnm-core.la \
|
||||||
$(GLIB_LIBS)
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = $(noinst_PROGRAMS)
|
TESTS = $(noinst_PROGRAMS)
|
||||||
|
|
||||||
test_general_SOURCES = \
|
test_general_SOURCES = \
|
||||||
|
|
|
@ -14,7 +14,7 @@ AM_CPPFLAGS = \
|
||||||
noinst_PROGRAMS = $(TESTS)
|
noinst_PROGRAMS = $(TESTS)
|
||||||
|
|
||||||
if WITH_VALGRIND
|
if WITH_VALGRIND
|
||||||
@VALGRIND_RULES@ --launch-dbus
|
@NM_LOG_COMPILER@ --launch-dbus
|
||||||
else
|
else
|
||||||
LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
|
LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -10,7 +10,7 @@ AM_CPPFLAGS = \
|
||||||
-DBUILD_DIR=\"$(abs_builddir)\" \
|
-DBUILD_DIR=\"$(abs_builddir)\" \
|
||||||
-DTEST_CERT_DIR=\"$(abs_top_srcdir)/libnm-core/tests/certs\"
|
-DTEST_CERT_DIR=\"$(abs_top_srcdir)/libnm-core/tests/certs\"
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = \
|
TESTS = \
|
||||||
test-settings-defaults \
|
test-settings-defaults \
|
||||||
test-crypto \
|
test-crypto \
|
||||||
|
|
|
@ -18,7 +18,7 @@ LDADD = \
|
||||||
noinst_PROGRAMS = $(TESTS)
|
noinst_PROGRAMS = $(TESTS)
|
||||||
|
|
||||||
if WITH_VALGRIND
|
if WITH_VALGRIND
|
||||||
@VALGRIND_RULES@ --launch-dbus
|
@NM_LOG_COMPILER@ --launch-dbus
|
||||||
else
|
else
|
||||||
LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
|
LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -46,7 +46,7 @@ test_arping_CPPFLAGS = \
|
||||||
|
|
||||||
test_arping_LDADD = $(DEVICES_LDADD)
|
test_arping_LDADD = $(DEVICES_LDADD)
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = \
|
TESTS = \
|
||||||
test-lldp \
|
test-lldp \
|
||||||
test-arping
|
test-arping
|
||||||
|
|
|
@ -25,7 +25,7 @@ test_general_SOURCES = \
|
||||||
|
|
||||||
test_general_LDADD = $(top_builddir)/src/libNetworkManager.la
|
test_general_LDADD = $(top_builddir)/src/libNetworkManager.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-general
|
TESTS = test-general
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -37,7 +37,7 @@ test_dhcp_utils_LDADD = \
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-dhcp-dhclient test-dhcp-utils
|
TESTS = test-dhcp-dhclient test-dhcp-utils
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
|
|
@ -19,6 +19,6 @@ test_dnsmasq_utils_SOURCES = \
|
||||||
test_dnsmasq_utils_LDADD = \
|
test_dnsmasq_utils_LDADD = \
|
||||||
$(top_builddir)/src/libNetworkManager.la
|
$(top_builddir)/src/libNetworkManager.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-dnsmasq-utils
|
TESTS = test-dnsmasq-utils
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,7 @@ test_general_LDADD = \
|
||||||
$(top_builddir)/src/libNetworkManagerTest.la
|
$(top_builddir)/src/libNetworkManagerTest.la
|
||||||
|
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = \
|
TESTS = \
|
||||||
test-address-fake \
|
test-address-fake \
|
||||||
test-address-linux \
|
test-address-linux \
|
||||||
|
|
|
@ -31,6 +31,6 @@ test_rdisc_fake_SOURCES = \
|
||||||
test_rdisc_fake_LDADD = \
|
test_rdisc_fake_LDADD = \
|
||||||
$(top_builddir)/src/libNetworkManagerTest.la
|
$(top_builddir)/src/libNetworkManagerTest.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-rdisc-fake
|
TESTS = test-rdisc-fake
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ test_ibft_LDADD = \
|
||||||
$(top_builddir)/src/settings/plugins/ibft/libnms-ibft-core.la \
|
$(top_builddir)/src/settings/plugins/ibft/libnms-ibft-core.la \
|
||||||
$(top_builddir)/src/libNetworkManager.la
|
$(top_builddir)/src/libNetworkManager.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-ibft
|
TESTS = test-ibft
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -35,7 +35,7 @@ test_ifcfg_rh_LDADD = \
|
||||||
$(top_builddir)/src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
|
$(top_builddir)/src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
|
||||||
$(top_builddir)/src/libNetworkManager.la
|
$(top_builddir)/src/libNetworkManager.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-ifcfg-rh
|
TESTS = test-ifcfg-rh
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -34,7 +34,7 @@ test_ifnet_LDADD = \
|
||||||
$(top_builddir)/src/settings/plugins/ifnet/libnms-ifnet-core.la \
|
$(top_builddir)/src/settings/plugins/ifnet/libnms-ifnet-core.la \
|
||||||
$(top_builddir)/src/libNetworkManager.la
|
$(top_builddir)/src/libNetworkManager.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-ifnet
|
TESTS = test-ifnet
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -26,7 +26,7 @@ test_ifupdown_LDADD = \
|
||||||
$(top_builddir)/src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
|
$(top_builddir)/src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
|
||||||
$(top_builddir)/src/libNetworkManager.la
|
$(top_builddir)/src/libNetworkManager.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-ifupdown
|
TESTS = test-ifupdown
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -32,7 +32,7 @@ test_keyfile_SOURCES = \
|
||||||
test_keyfile_LDADD = \
|
test_keyfile_LDADD = \
|
||||||
$(top_builddir)/src/libNetworkManager.la
|
$(top_builddir)/src/libNetworkManager.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-keyfile
|
TESTS = test-keyfile
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -20,5 +20,5 @@ test_supplicant_config_SOURCES = \
|
||||||
test_supplicant_config_LDADD = \
|
test_supplicant_config_LDADD = \
|
||||||
$(top_builddir)/src/libNetworkManager.la
|
$(top_builddir)/src/libNetworkManager.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-supplicant-config
|
TESTS = test-supplicant-config
|
||||||
|
|
|
@ -154,7 +154,7 @@ EXTRA_DIST = test-secret-agent.py
|
||||||
|
|
||||||
###########################################
|
###########################################
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = \
|
TESTS = \
|
||||||
test-ip4-config \
|
test-ip4-config \
|
||||||
test-ip6-config \
|
test-ip6-config \
|
||||||
|
|
|
@ -23,7 +23,7 @@ test_config_SOURCES = \
|
||||||
test_config_LDADD = \
|
test_config_LDADD = \
|
||||||
$(top_builddir)/src/libNetworkManagerTest.la
|
$(top_builddir)/src/libNetworkManagerTest.la
|
||||||
|
|
||||||
@VALGRIND_RULES@
|
@NM_LOG_COMPILER@
|
||||||
TESTS = test-config
|
TESTS = test-config
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
|
Loading…
Reference in a new issue