all/test: modify makefiles to run tests (without arguments) via autoconf TESTS=

This results in some nice coloring. Only move the tests that are called
without arguments from check-local to TESTS.

Signed-off-by: Thomas Haller <thaller@redhat.com>

10 files changed, 12 insertions, 32 deletions

diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index 0ef1bc007e..52e8adc349 100644
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -68,12 +68,7 @@ test_setting_dcb_LDADD = \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS)
 
-check-local: test-settings-defaults test-crypto test-secrets test-setting-8021x test-setting-dcb
-	$(abs_builddir)/test-settings-defaults
-	$(abs_builddir)/test-secrets
-	$(abs_builddir)/test-general
-	$(abs_builddir)/test-setting-dcb
-
+check-local: test-crypto test-setting-8021x
 # Private key and CA certificate in the same file (PEM)
 	$(abs_builddir)/test-setting-8021x $(srcdir)/certs/test_key_and_cert.pem "test"
 
@@ -130,4 +125,6 @@ check-local: test-settings-defaults test-crypto test-secrets test-setting-8021x
 		$(srcdir)/certs/pkcs8-enc-key.pem \
 		"1234567890"
 
+TESTS = test-settings-defaults test-secrets test-general test-setting-dcb
+
 endif
diff --git a/src/config/tests/Makefile.am b/src/config/tests/Makefile.am
index 4fb38c731d..6e64812b41 100644
--- a/src/config/tests/Makefile.am
+++ b/src/config/tests/Makefile.am
@@ -20,8 +20,7 @@ test_config_SOURCES = \
 test_config_LDADD = \
 	$(top_builddir)/src/libNetworkManager.la
 
-check-local: test-config
-	$(abs_builddir)/test-config
+TESTS = test-config
 
 EXTRA_DIST = \
 	NetworkManager.conf \
diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index 67cbca81f9..6ef828d57f 100644
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -21,8 +21,7 @@ test_dhcp_dhclient_SOURCES = \
 test_dhcp_dhclient_LDADD = \
 	$(top_builddir)/src/libNetworkManager.la
 
-check-local: test-dhcp-dhclient
-	$(abs_builddir)/test-dhcp-dhclient
+TESTS = test-dhcp-dhclient
 
 EXTRA_DIST = \
 	test-dhclient-duid.leases \
diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am
index 779e1eb2e1..9c7f4ab5c5 100644
--- a/src/dnsmasq-manager/tests/Makefile.am
+++ b/src/dnsmasq-manager/tests/Makefile.am
@@ -19,6 +19,5 @@ test_dnsmasq_utils_SOURCES = \
 test_dnsmasq_utils_LDADD = \
 	$(top_builddir)/src/libNetworkManager.la
 
-check-local: test-dnsmasq-utils
-	$(abs_builddir)/test-dnsmasq-utils
+TESTS = test-dnsmasq-utils
 
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 89fd92000a..e758776da0 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -56,9 +56,7 @@ test_ifcfg_rh_utils_SOURCES = \
 test_ifcfg_rh_utils_LDADD = \
 	$(AM_LDADD)
 
-check-local: test-ifcfg-rh
-	$(abs_builddir)/test-ifcfg-rh-utils
-	$(abs_builddir)/test-ifcfg-rh
+TESTS = test-ifcfg-rh-utils test-ifcfg-rh
 
 EXTRA_DIST = \
 	iscsiadm-test-dhcp \
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index 13eed25e08..160b332726 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -30,8 +30,7 @@ test_ifupdown_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS)
 
-check-local: test-ifupdown
-	$(abs_builddir)/test-ifupdown
+TESTS = test-ifupdown
 
 EXTRA_DIST = \
 	test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index 3424e2768b..fae6e4eaf1 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -40,7 +40,6 @@ test_keyfile_LDADD = \
 	$(DBUS_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS)
 
-check-local: test-keyfile
-	$(abs_builddir)/test-keyfile
+TESTS = test-keyfile
 
 endif
diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am
index 0c509a9e8e..4115d4bad3 100644
--- a/src/settings/tests/Makefile.am
+++ b/src/settings/tests/Makefile.am
@@ -20,5 +20,4 @@ test_wired_defname_LDADD = \
 
 ###########################################
 
-check-local: test-wired-defname
-	$(abs_builddir)/test-wired-defname
+TESTS = test-wired-defname
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index b27d46fe5f..9defe66b1b 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -18,5 +18,4 @@ test_supplicant_config_SOURCES = \
 test_supplicant_config_LDADD = \
 	$(top_builddir)/src/libNetworkManager.la
 
-check-local: test-supplicant-config
-	$(abs_builddir)/test-supplicant-config
+TESTS = test-supplicant-config
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 50609cf8b4..b35eb515ad 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -98,13 +98,5 @@ EXTRA_DIST = test-secret-agent.py
 
 ###########################################
 
-check-local: test-dhcp-options test-policy-hosts test-wifi-ap-utils test-ip4-config test-ip6-config
-	$(abs_builddir)/test-dhcp-options
-	$(abs_builddir)/test-policy-hosts
-	$(abs_builddir)/test-wifi-ap-utils
-	$(abs_builddir)/test-ip4-config
-	$(abs_builddir)/test-ip6-config
-	$(abs_builddir)/test-dcb
-	$(abs_builddir)/test-resolvconf-capture
-	$(abs_builddir)/test-general
+TESTS = test-dhcp-options test-policy-hosts test-wifi-ap-utils test-ip4-config test-ip6-config test-dcb test-resolvconf-capture test-general