Web lists-archives.com

[PATCH 6/6] tests: Don't run tests requiring DBUS unconditionally




The tests defaultvalue, gdbus-peer and gdbus-unix-addresses will fail
without DBUS, so only run them in case we HAVE_DBUS_DAEMON.

Signed-off-by: Ingo Brückl <ib@xxxxxxxxxxxxxxx>
---
 gio/tests/Makefile.am | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index bd1c196..d8054f7 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -34,7 +34,6 @@ test_programs = \
 	credentials				\
 	data-input-stream			\
 	data-output-stream			\
-	defaultvalue				\
 	fileattributematcher			\
 	filter-streams				\
 	giomodule				\
@@ -247,7 +246,6 @@ if OS_UNIX
 test_programs += \
 	file					\
 	gdbus-peer-object-manager		\
-	gdbus-unix-addresses			\
 	live-g-file				\
 	socket-address				\
 	stream-rw_all				\
@@ -385,7 +383,6 @@ uninstalled_test_extra_programs += gdbus-test-fixture
 gdbus_test_fixture_LDADD = gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD)

 # This is peer to peer so it doesn't need a session bus (so we can run it normally)
-test_programs += gdbus-peer
 gdbus_peer_LDADD = gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD)

 # This test is currently unreliable
@@ -400,6 +397,7 @@ gdbus_sessionbus_sources = gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h g
 test_programs += \
 	actions					\
 	dbus-appinfo				\
+	defaultvalue				\
 	gapplication				\
 	gdbus-auth				\
 	gdbus-bz627724				\
@@ -412,6 +410,7 @@ test_programs += \
 	gdbus-export				\
 	gdbus-introspection			\
 	gdbus-names				\
+	gdbus-peer				\
 	gdbus-proxy				\
 	gdbus-proxy-threads			\
 	gdbus-proxy-well-known-name		\
@@ -422,6 +421,10 @@ test_programs += \
 	gnotification				\
 	$(NULL)

+if OS_UNIX
+test_programs += gdbus-unix-addresses
+endif
+
 gdbus_proxy_threads_CFLAGS = $(AM_CFLAGS) $(DBUS1_CFLAGS)
 actions_SOURCES                          = $(gdbus_sessionbus_sources) actions.c
 dbus_appinfo_SOURCES                     = $(gdbus_sessionbus_sources) dbus-appinfo.c
--
2.8.2

_______________________________________________
gtk-devel-list mailing list
gtk-devel-list@xxxxxxxxx
https://mail.gnome.org/mailman/listinfo/gtk-devel-list