Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 0 insertions, 38 deletions

diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
deleted file mode 100644
index fd08b896..00000000
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-if ENABLE_TESTS
-
-SUBDIRS=keyfiles
-
-@GNOME_CODE_COVERAGE_RULES@
-
-AM_CPPFLAGS = \
-	-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$(srcdir)/../ \
-	$(GLIB_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS) \
-	-DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
-	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \
-	-DNMCONFDIR=\"nonexistent\"
-
-noinst_PROGRAMS = test-keyfile
-
-test_keyfile_SOURCES = \
-	test-keyfile.c \
-	../reader.c \
-	../writer.c \
-	../utils.c
-
-test_keyfile_LDADD = \
-	$(top_builddir)/src/libNetworkManager.la \
-	$(CODE_COVERAGE_LDFLAGS)
-
-@VALGRIND_RULES@
-TESTS = test-keyfile
-
-endif