Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 0 insertions, 50 deletions

diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am
deleted file mode 100644
index 8ece14c6..00000000
--- a/src/settings/plugins/ifnet/tests/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-if ENABLE_TESTS
-
-@GNOME_CODE_COVERAGE_RULES@
-
-AM_CPPFLAGS= \
-	-I$(srcdir)/../ \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/settings \
-	-I$(top_srcdir)/src/platform \
-	-DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	$(CHECK_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS) \
-	-DTEST_IFNET_DIR=\"$(abs_srcdir)\" \
-	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
-	-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"' \
-	-DSYSCONFDIR=\"nonexistent\"
-
-noinst_PROGRAMS = test-ifnet
-test_ifnet_SOURCES = \
-	test-ifnet.c \
-	../connection_parser.c \
-	../net_parser.c \
-	../net_utils.c \
-	../wpa_parser.c
-
-test_ifnet_LDFLAGS = \
-	$(CODE_COVERAGE_LDFLAGS)
-
-test_ifnet_LDADD = $(top_builddir)/src/libNetworkManager.la
-
-@VALGRIND_RULES@
-TESTS = test-ifnet
-
-check-local:
-	LD_BIND_NOW=1 LD_PRELOAD=$(builddir)/../.libs/libnm-settings-plugin-ifnet.so $(top_builddir)/src/NetworkManager --version >/dev/null
-
-endif
-
-EXTRA_DIST = \
-	net \
-	net.all \
-	nm-system-settings.conf \
-	wpa_supplicant.conf \
-	test_ca_cert.pem