Merge tag 'upstream/0.9.10.0'

Upstream version 0.9.10.0

1 files changed, 45 insertions, 29 deletions

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 77e6c0f5..ee5be17d 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,20 +1,25 @@
-if ENABLE_TESTS
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_builddir)/libnm-util \
+	-I$(top_srcdir)/src/logging \
+	-I$(top_srcdir)/src/platform \
 	-I$(top_srcdir)/src/dhcp-manager \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 noinst_PROGRAMS = \
 	test-dhcp-options \
-	test-policy-hosts \
-	test-wifi-ap-utils
+	test-general \
+	test-ip4-config \
+	test-ip6-config \
+	test-dcb \
+	test-resolvconf-capture
 
 ####### DHCP options test #######
 
@@ -27,32 +32,47 @@ test_dhcp_options_CPPFLAGS = \
 	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\"
 
 test_dhcp_options_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/dhcp-manager/libdhcp-manager.la \
-	$(top_builddir)/src/libtest-dhcp.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
+	$(top_builddir)/src/libNetworkManager.la
+
+####### ip4 config test #######
+
+test_ip4_config_SOURCES = \
+	test-ip4-config.c
+
+test_ip4_config_LDADD = \
+	$(top_builddir)/src/libNetworkManager.la
+
+####### ip6 config test #######
+
+test_ip6_config_SOURCES = \
+	test-ip6-config.c
+
+test_ip6_config_LDADD = \
+	$(top_builddir)/src/libNetworkManager.la
+
+####### DCB test #######
+
+test_dcb_SOURCES = \
+	test-dcb.c
+
+test_dcb_LDADD = \
+	$(top_builddir)/src/libNetworkManager.la
 
-####### policy /etc/hosts test #######
+####### resolv.conf capture test #######
 
-test_policy_hosts_SOURCES = \
-	test-policy-hosts.c
+test_resolvconf_capture_SOURCES = \
+	test-resolvconf-capture.c
 
-test_policy_hosts_LDADD = \
-	-ldl \
-	$(top_builddir)/src/libtest-policy-hosts.la \
-	$(GLIB_LIBS)
+test_resolvconf_capture_LDADD = \
+	$(top_builddir)/src/libNetworkManager.la
 
-####### wifi ap utils test #######
+####### general test #######
 
-test_wifi_ap_utils_SOURCES = \
-	test-wifi-ap-utils.c
+test_general_SOURCES = \
+	test-general.c
 
-test_wifi_ap_utils_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/libtest-wifi-ap-utils.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
+test_general_LDADD = \
+	$(top_builddir)/src/libNetworkManager.la
 
 ####### secret agent interface test #######
 
@@ -60,9 +80,5 @@ EXTRA_DIST = test-secret-agent.py
 
 ###########################################
 
-check-local: test-dhcp-options test-policy-hosts test-wifi-ap-utils
-	$(abs_builddir)/test-dhcp-options
-	$(abs_builddir)/test-policy-hosts
-	$(abs_builddir)/test-wifi-ap-utils
+TESTS = test-dhcp-options test-ip4-config test-ip6-config test-dcb test-resolvconf-capture test-general
 
-endif