summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-05-14 14:45:57 +0200
committerLubomir Rintel <lkundrak@v3.sk>2015-05-26 13:51:45 +0200
commit6463ce5dd9ffc1aae3ca9ddc4dac4e25fd815237 (patch)
tree7b31c920ba83670d3d0afa1e324cb8cae3c4ed63 /src
parent380ed633180a1e20cb70b2cfde482a1cda8278e0 (diff)
downloadNetworkManager-6463ce5dd9ffc1aae3ca9ddc4dac4e25fd815237.tar.gz
tests: use the TAP formatter
The test results in standard format are easily integrated into CI systems.
Diffstat (limited to 'src')
-rw-r--r--src/devices/wifi/tests/Makefile.am2
-rw-r--r--src/dhcp-manager/tests/Makefile.am2
-rw-r--r--src/dnsmasq-manager/tests/Makefile.am2
-rw-r--r--src/platform/tests/Makefile.am3
-rw-r--r--src/rdisc/tests/Makefile.am2
-rw-r--r--src/settings/plugins/ibft/tests/Makefile.am2
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/Makefile.am2
-rw-r--r--src/settings/plugins/ifupdown/tests/Makefile.am2
-rw-r--r--src/settings/plugins/keyfile/tests/Makefile.am2
-rw-r--r--src/supplicant-manager/tests/Makefile.am2
-rw-r--r--src/tests/Makefile.am2
-rw-r--r--src/tests/config/Makefile.am2
12 files changed, 24 insertions, 1 deletions
diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am
index 2a7d784970..72dc7189bd 100644
--- a/src/devices/wifi/tests/Makefile.am
+++ b/src/devices/wifi/tests/Makefile.am
@@ -24,5 +24,7 @@ test_wifi_ap_utils_SOURCES = \
test_wifi_ap_utils_LDADD = $(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-wifi-ap-utils
diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index 8aa79a29be..2fb39e0417 100644
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -38,6 +38,8 @@ test_dhcp_utils_LDADD = \
#################################
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
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 b51de6aa5d..ed1225549d 100644
--- a/src/dnsmasq-manager/tests/Makefile.am
+++ b/src/dnsmasq-manager/tests/Makefile.am
@@ -20,5 +20,7 @@ test_dnsmasq_utils_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-dnsmasq-utils
diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am
index 081023c63d..bc032d212e 100644
--- a/src/platform/tests/Makefile.am
+++ b/src/platform/tests/Makefile.am
@@ -109,8 +109,9 @@ test_cleanup_linux_CPPFLAGS = \
-DKERNEL_HACKS=1
test_cleanup_linux_LDADD = $(PLATFORM_LDADD)
-
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = \
test-address-fake \
test-address-linux \
diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am
index 5d6f8b5bcb..e10b34f003 100644
--- a/src/rdisc/tests/Makefile.am
+++ b/src/rdisc/tests/Makefile.am
@@ -33,5 +33,7 @@ test_rdisc_fake_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-rdisc-fake
diff --git a/src/settings/plugins/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am
index 3c7c94accd..e7285e0e95 100644
--- a/src/settings/plugins/ibft/tests/Makefile.am
+++ b/src/settings/plugins/ibft/tests/Makefile.am
@@ -33,6 +33,8 @@ test_ibft_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
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 a3f6a05204..f629830813 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -48,6 +48,8 @@ test_ifcfg_rh_utils_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-ifcfg-rh-utils test-ifcfg-rh
endif
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index 2e927db931..e43a5113df 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -25,6 +25,8 @@ test_ifupdown_LDADD = \
# TODO: enable valgrind for ifupdown. Currently it fails.
#@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-ifupdown
endif
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index a79e20b5b6..dffa276eb0 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -35,6 +35,8 @@ test_keyfile_LDADD = \
$(CODE_COVERAGE_LDFLAGS)
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-keyfile
endif
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index 85268dcff9..d53b7ff4c7 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -19,4 +19,6 @@ test_supplicant_config_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-supplicant-config
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 83632bd198..fdda3b07d0 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -117,6 +117,8 @@ EXTRA_DIST = test-secret-agent.py
###########################################
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = \
test-ip4-config \
test-ip6-config \
diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am
index 42c6b9a1b0..5936624cea 100644
--- a/src/tests/config/Makefile.am
+++ b/src/tests/config/Makefile.am
@@ -24,6 +24,8 @@ test_config_LDADD = \
$(top_builddir)/src/libNetworkManager.la
@VALGRIND_RULES@
+AM_TESTS_FD_REDIRECT = --tap
+LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-config
EXTRA_DIST = \