diff options
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | dispatcher/tests/Makefile.am | 2 | ||||
-rw-r--r-- | libnm-core/tests/Makefile.am | 2 | ||||
-rw-r--r-- | libnm-glib/tests/Makefile.am | 2 | ||||
-rw-r--r-- | libnm-util/tests/Makefile.am | 2 | ||||
-rw-r--r-- | libnm/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/devices/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/devices/wifi/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/dhcp-manager/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/dnsmasq-manager/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/platform/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/rdisc/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/settings/plugins/ibft/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/settings/plugins/ifnet/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/settings/plugins/ifupdown/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/settings/plugins/keyfile/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/supplicant-manager/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/tests/config/Makefile.am | 2 |
20 files changed, 21 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index a245d72934..7b038fd508 100644 --- a/configure.ac +++ b/configure.ac @@ -1070,8 +1070,8 @@ else fi fi 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(VALGRIND_RULES, [])) + 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(NM_LOG_COMPILER, [])) AM_CONDITIONAL(WITH_VALGRIND, test "${with_valgrind}" != "no") GTK_DOC_CHECK(1.0) diff --git a/dispatcher/tests/Makefile.am b/dispatcher/tests/Makefile.am index e7e50adc03..994d8c10a1 100644 --- a/dispatcher/tests/Makefile.am +++ b/dispatcher/tests/Makefile.am @@ -26,7 +26,7 @@ test_dispatcher_envp_LDADD = \ ############################################################################### -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-dispatcher-envp endif diff --git a/libnm-core/tests/Makefile.am b/libnm-core/tests/Makefile.am index 485fd1410c..0cc48efab3 100644 --- a/libnm-core/tests/Makefile.am +++ b/libnm-core/tests/Makefile.am @@ -33,7 +33,7 @@ LDADD = \ $(top_builddir)/libnm-core/libnm-core.la \ $(GLIB_LIBS) -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = $(noinst_PROGRAMS) test_general_SOURCES = \ diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am index 3368d60cfe..4a51eba750 100644 --- a/libnm-glib/tests/Makefile.am +++ b/libnm-glib/tests/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS = \ noinst_PROGRAMS = $(TESTS) if WITH_VALGRIND -@VALGRIND_RULES@ --launch-dbus +@NM_LOG_COMPILER@ --launch-dbus else LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh endif diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index 1076a933e6..49b29bf01e 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = \ -DBUILD_DIR=\"$(abs_builddir)\" \ -DTEST_CERT_DIR=\"$(abs_top_srcdir)/libnm-core/tests/certs\" -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = \ test-settings-defaults \ test-crypto \ diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am index 1c65f72340..5507c5267f 100644 --- a/libnm/tests/Makefile.am +++ b/libnm/tests/Makefile.am @@ -18,7 +18,7 @@ LDADD = \ noinst_PROGRAMS = $(TESTS) if WITH_VALGRIND -@VALGRIND_RULES@ --launch-dbus +@NM_LOG_COMPILER@ --launch-dbus else LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh endif diff --git a/src/devices/tests/Makefile.am b/src/devices/tests/Makefile.am index 5914b13108..7d6aa675e9 100644 --- a/src/devices/tests/Makefile.am +++ b/src/devices/tests/Makefile.am @@ -46,7 +46,7 @@ test_arping_CPPFLAGS = \ test_arping_LDADD = $(DEVICES_LDADD) -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = \ test-lldp \ test-arping diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am index 1f0171d0db..e12f4c0eb5 100644 --- a/src/devices/wifi/tests/Makefile.am +++ b/src/devices/wifi/tests/Makefile.am @@ -25,7 +25,7 @@ test_general_SOURCES = \ test_general_LDADD = $(top_builddir)/src/libNetworkManager.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-general endif diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am index b26cea1411..8e75e3e194 100644 --- a/src/dhcp-manager/tests/Makefile.am +++ b/src/dhcp-manager/tests/Makefile.am @@ -37,7 +37,7 @@ test_dhcp_utils_LDADD = \ ################################# -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-dhcp-dhclient test-dhcp-utils EXTRA_DIST = \ diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am index 6d7a2a92d0..3c4a895434 100644 --- a/src/dnsmasq-manager/tests/Makefile.am +++ b/src/dnsmasq-manager/tests/Makefile.am @@ -19,6 +19,6 @@ test_dnsmasq_utils_SOURCES = \ test_dnsmasq_utils_LDADD = \ $(top_builddir)/src/libNetworkManager.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-dnsmasq-utils diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am index 0633dd28ba..43b3121676 100644 --- a/src/platform/tests/Makefile.am +++ b/src/platform/tests/Makefile.am @@ -117,7 +117,7 @@ test_general_LDADD = \ $(top_builddir)/src/libNetworkManagerTest.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = \ test-address-fake \ test-address-linux \ diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am index b054179e8b..2d8ab4659c 100644 --- a/src/rdisc/tests/Makefile.am +++ b/src/rdisc/tests/Makefile.am @@ -31,6 +31,6 @@ test_rdisc_fake_SOURCES = \ test_rdisc_fake_LDADD = \ $(top_builddir)/src/libNetworkManagerTest.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-rdisc-fake diff --git a/src/settings/plugins/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am index 79ae507eb0..2705487957 100644 --- a/src/settings/plugins/ibft/tests/Makefile.am +++ b/src/settings/plugins/ibft/tests/Makefile.am @@ -31,7 +31,7 @@ test_ibft_LDADD = \ $(top_builddir)/src/settings/plugins/ibft/libnms-ibft-core.la \ $(top_builddir)/src/libNetworkManager.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-ibft endif diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am index 299843833e..35f077b596 100644 --- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am @@ -35,7 +35,7 @@ test_ifcfg_rh_LDADD = \ $(top_builddir)/src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ $(top_builddir)/src/libNetworkManager.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-ifcfg-rh endif diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am index 283c758942..8ffedaad0a 100644 --- a/src/settings/plugins/ifnet/tests/Makefile.am +++ b/src/settings/plugins/ifnet/tests/Makefile.am @@ -34,7 +34,7 @@ test_ifnet_LDADD = \ $(top_builddir)/src/settings/plugins/ifnet/libnms-ifnet-core.la \ $(top_builddir)/src/libNetworkManager.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-ifnet endif diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am index d8d13c3b2d..ee70504d7f 100644 --- a/src/settings/plugins/ifupdown/tests/Makefile.am +++ b/src/settings/plugins/ifupdown/tests/Makefile.am @@ -26,7 +26,7 @@ test_ifupdown_LDADD = \ $(top_builddir)/src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ $(top_builddir)/src/libNetworkManager.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-ifupdown endif diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am index c0b67d1595..b8f241cc9a 100644 --- a/src/settings/plugins/keyfile/tests/Makefile.am +++ b/src/settings/plugins/keyfile/tests/Makefile.am @@ -32,7 +32,7 @@ test_keyfile_SOURCES = \ test_keyfile_LDADD = \ $(top_builddir)/src/libNetworkManager.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-keyfile endif diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index 3ab9122e81..652b935f09 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -20,5 +20,5 @@ test_supplicant_config_SOURCES = \ test_supplicant_config_LDADD = \ $(top_builddir)/src/libNetworkManager.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-supplicant-config diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 35c70d2103..fc22658d9f 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -154,7 +154,7 @@ EXTRA_DIST = test-secret-agent.py ########################################### -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = \ test-ip4-config \ test-ip6-config \ diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am index d0cb797d15..2b3ce90add 100644 --- a/src/tests/config/Makefile.am +++ b/src/tests/config/Makefile.am @@ -23,7 +23,7 @@ test_config_SOURCES = \ test_config_LDADD = \ $(top_builddir)/src/libNetworkManagerTest.la -@VALGRIND_RULES@ +@NM_LOG_COMPILER@ TESTS = test-config EXTRA_DIST = \ |