fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 22:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: use the TAP formatter

Browse source 
The test results in standard format are easily integrated into CI systems.

(cherry picked from commit 6463ce5dd9)
This commit is contained in:
Lubomir Rintel 2015-05-14 14:45:57 +02:00 • committed by Thomas Haller
parent df11b267fd
commit fe3e32c034
19 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
callouts/tests/Makefile.am
View file

@ -29,6 +29,8 @@ test_dispatcher_envp_LDADD = \
###########################################
@VALGRIND_RULES@
AM_TESTS_FD_REDIRECT = --tap
LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-dispatcher-envp
endif

1
configure.ac
View file

@ -15,6 +15,7 @@ AC_INIT([NetworkManager], [nm_version],
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_REQUIRE_AUX_FILE([tap-driver.sh])
AM_INIT_AUTOMAKE(1.12 tar-ustar no-dist-gzip dist-bzip2 -Wno-portability) dnl NB: Do not [quote] this parameter.
AM_MAINTAINER_MODE([enable])

2
libnm-core/tests/Makefile.am
View file

@ -25,6 +25,8 @@ LDADD = \
$(GLIB_LIBS)
@VALGRIND_RULES@
AM_TESTS_FD_REDIRECT = --tap
LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = $(noinst_PROGRAMS)
endif

2
libnm-glib/tests/Makefile.am
View file

@ -17,6 +17,8 @@ if WITH_VALGRIND
else
LOG_COMPILER = $(srcdir)/libnm-glib-test-launch.sh
endif
AM_TESTS_FD_REDIRECT = --tap
LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-nm-client test-remote-settings-client
####### NMClient and non-settings tests #######

2
libnm-util/tests/Makefile.am
View file

@ -11,6 +11,8 @@ AM_CPPFLAGS = \
-DTEST_CERT_DIR=\"$(top_srcdir)/libnm-core/tests/certs/\"
@VALGRIND_RULES@
AM_TESTS_FD_REDIRECT = --tap
LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = \
test-settings-defaults \
test-crypto \

2
libnm/tests/Makefile.am
View file

@ -22,6 +22,8 @@ if WITH_VALGRIND
else
LOG_COMPILER = $(srcdir)/libnm-test-launch.sh
endif
AM_TESTS_FD_REDIRECT = --tap
LOG_DRIVER = $(top_srcdir)/build-aux/tap-driver.sh
TESTS = test-nm-client test-remote-settings-client test-secret-agent
test_nm_client_SOURCES = \

2
src/devices/wifi/tests/Makefile.am
View file

@ -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

2
src/dhcp-manager/tests/Makefile.am
View file

@ -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 = \

2
src/dnsmasq-manager/tests/Makefile.am
View file

@ -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

3
src/platform/tests/Makefile.am
View file

@ -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 \

2
src/rdisc/tests/Makefile.am
View file

@ -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

2
src/settings/plugins/ibft/tests/Makefile.am
View file

@ -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

2
src/settings/plugins/ifcfg-rh/tests/Makefile.am
View file

@ -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

2
src/settings/plugins/ifupdown/tests/Makefile.am
View file

@ -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

2
src/settings/plugins/keyfile/tests/Makefile.am
View file

@ -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

2
src/supplicant-manager/tests/Makefile.am
View file

@ -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

2
src/tests/Makefile.am
View file

@ -87,6 +87,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 \

2
src/tests/config/Makefile.am
View file

@ -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 = \

4
tools/run-test-valgrind.sh
View file

@ -9,7 +9,7 @@ if [ "$1" = "--launch-dbus" ]; then
trap "kill $DBUS_SESSION_BUS_PID" EXIT
shift
fi
TEST="$1"; shift
TEST="$1"
if [ "$NMTST_NO_VALGRIND" != "" ]; then
"$TEST"
@ -27,7 +27,7 @@ $LIBTOOL --mode=execute "$VALGRIND" \
--gen-suppressions=all \
--suppressions="$SUPPRESSIONS" \
--log-file="$LOGFILE" \
"$TEST"
"$@"
RESULT=$?
if [ $RESULT -eq 0 -a "$(wc -c "$LOGFILE" | awk '{print$1}')" -ne 0 ]; then