fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 08:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

builds: only enable TAP driver for glib >= 2.37.6

Browse source 
No TAP support for previous versions and --tap argument is silently ignored,
confusing the TAP driver.
This commit is contained in:
Lubomir Rintel 2015-05-26 15:21:12 +02:00
parent a5e43ab510
commit c47c06470a
18 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
callouts/tests/Makefile.am
View file

@ -29,8 +29,6 @@ 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

6
configure.ac
View file

@ -278,7 +278,11 @@ else
fi
AM_CONDITIONAL(HAVE_DBUS_GLIB_100, test "${have_dbus_glib_100}" = "yes")
PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.32 gmodule-2.0)
PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
[AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh'),
AC_SUBST(AM_TESTS_FD_REDIRECT, '--tap')],
[PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.32 gmodule-2.0)
AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/test-driver')])
dnl GLIB_VERSION_MIN_REQUIRED should match the version above.
dnl GLIB_VERSION_MAX_ALLOWED should be set to the same version;

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

@ -26,8 +26,6 @@ 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,8 +17,6 @@ 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,8 +11,6 @@ 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,8 +22,6 @@ 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,7 +24,5 @@ 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,8 +38,6 @@ 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,7 +20,5 @@ 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

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

@ -110,8 +110,6 @@ test_cleanup_linux_CPPFLAGS = \
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,7 +33,5 @@ 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,8 +33,6 @@ 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,8 +48,6 @@ 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,8 +25,6 @@ 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,8 +35,6 @@ 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,6 +19,4 @@ 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

@ -117,8 +117,6 @@ 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,8 +24,6 @@ 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 = \