diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2015-05-26 15:21:12 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-05-28 12:51:24 +0200 |
commit | c47c06470a0de70f5495d8919fd7f6b5369a5070 (patch) | |
tree | 3d2658033e0ebf6450fbaac4f261e72a849f2ed6 | |
parent | a5e43ab51080bb09237afeb3f3c1c855e0127379 (diff) | |
download | NetworkManager-c47c06470a0de70f5495d8919fd7f6b5369a5070.tar.gz |
builds: only enable TAP driver for glib >= 2.37.6
No TAP support for previous versions and --tap argument is silently ignored,
confusing the TAP driver.
-rw-r--r-- | callouts/tests/Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-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/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/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 |
18 files changed, 5 insertions, 35 deletions
diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index f3169d7c50..a0ed40159f 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index dd10f09a26..5f2eb2e851 100644 --- a/configure.ac +++ b/configure.ac @@ -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; diff --git a/libnm-core/tests/Makefile.am b/libnm-core/tests/Makefile.am index 13e3c01bcc..daa5825b50 100644 --- a/libnm-core/tests/Makefile.am +++ b/libnm-core/tests/Makefile.am @@ -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 diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am index a01a50e724..7168d3dd15 100644 --- a/libnm-glib/tests/Makefile.am +++ b/libnm-glib/tests/Makefile.am @@ -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 ####### diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index f90fe8bf6e..16a7f8f3fc 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -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 \ diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am index 0e7db21b66..a2dafec768 100644 --- a/libnm/tests/Makefile.am +++ b/libnm/tests/Makefile.am @@ -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 = \ diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am index 72dc7189bd..2a7d784970 100644 --- a/src/devices/wifi/tests/Makefile.am +++ b/src/devices/wifi/tests/Makefile.am @@ -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 diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am index 2fb39e0417..8aa79a29be 100644 --- a/src/dhcp-manager/tests/Makefile.am +++ b/src/dhcp-manager/tests/Makefile.am @@ -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 = \ diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am index ed1225549d..b51de6aa5d 100644 --- a/src/dnsmasq-manager/tests/Makefile.am +++ b/src/dnsmasq-manager/tests/Makefile.am @@ -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 diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am index bc032d212e..92400f9091 100644 --- a/src/platform/tests/Makefile.am +++ b/src/platform/tests/Makefile.am @@ -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 \ diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am index e10b34f003..5d6f8b5bcb 100644 --- a/src/rdisc/tests/Makefile.am +++ b/src/rdisc/tests/Makefile.am @@ -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 diff --git a/src/settings/plugins/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am index e7285e0e95..3c7c94accd 100644 --- a/src/settings/plugins/ibft/tests/Makefile.am +++ b/src/settings/plugins/ibft/tests/Makefile.am @@ -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 diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am index f629830813..a3f6a05204 100644 --- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am @@ -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 diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am index e43a5113df..2e927db931 100644 --- a/src/settings/plugins/ifupdown/tests/Makefile.am +++ b/src/settings/plugins/ifupdown/tests/Makefile.am @@ -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 diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am index dffa276eb0..a79e20b5b6 100644 --- a/src/settings/plugins/keyfile/tests/Makefile.am +++ b/src/settings/plugins/keyfile/tests/Makefile.am @@ -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 diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index d53b7ff4c7..85268dcff9 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -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 diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index fdda3b07d0..83632bd198 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -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 \ diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am index 5936624cea..42c6b9a1b0 100644 --- a/src/tests/config/Makefile.am +++ b/src/tests/config/Makefile.am @@ -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 = \ |