luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests: Don't run tests requiring DBUS unconditionally

Browse Source 
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@wupperonline.de>

https://bugzilla.gnome.org/show_bug.cgi?id=767609
This commit is contained in:
Ingo Brückl 2016-06-13 16:23:42 +02:00 committed by Sébastien Wilmet
parent 7ff42a4003
commit 731e7fea17
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gio/tests/Makefile.am
View File

@ -32,7 +32,6 @@ test_programs = \
credentials \ credentials \
data-input-stream \ data-input-stream \
data-output-stream \ data-output-stream \
defaultvalue \
fileattributematcher \ fileattributematcher \
filter-streams \ filter-streams \
giomodule \ giomodule \
@ -245,7 +244,6 @@ if OS_UNIX
test_programs += \ test_programs += \
file \ file \
gdbus-peer-object-manager \ gdbus-peer-object-manager \
gdbus-unix-addresses \
live-g-file \ live-g-file \
socket-address \ socket-address \
stream-rw_all \ stream-rw_all \
@ -383,7 +381,6 @@ uninstalled_test_extra_programs += gdbus-test-fixture
gdbus_test_fixture_LDADD = gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD) 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) # 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) gdbus_peer_LDADD = gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD)
# This test is currently unreliable # This test is currently unreliable
@ -398,6 +395,7 @@ gdbus_sessionbus_sources = gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h g
test_programs += \ test_programs += \
actions \ actions \
dbus-appinfo \ dbus-appinfo \
defaultvalue \
gapplication \ gapplication \
gdbus-auth \ gdbus-auth \
gdbus-bz627724 \ gdbus-bz627724 \
@ -410,6 +408,7 @@ test_programs += \
gdbus-export \ gdbus-export \
gdbus-introspection \ gdbus-introspection \
gdbus-names \ gdbus-names \
gdbus-peer \
gdbus-proxy \ gdbus-proxy \
gdbus-proxy-threads \ gdbus-proxy-threads \
gdbus-proxy-well-known-name \ gdbus-proxy-well-known-name \
@ -420,6 +419,10 @@ test_programs += \
gnotification \ gnotification \
$(NULL) $(NULL)
if OS_UNIX
test_programs += gdbus-unix-addresses
endif
gdbus_proxy_threads_CFLAGS = $(AM_CFLAGS) $(DBUS1_CFLAGS) gdbus_proxy_threads_CFLAGS = $(AM_CFLAGS) $(DBUS1_CFLAGS)
actions_SOURCES = $(gdbus_sessionbus_sources) actions.c actions_SOURCES = $(gdbus_sessionbus_sources) actions.c
dbus_appinfo_SOURCES = $(gdbus_sessionbus_sources) dbus-appinfo.c dbus_appinfo_SOURCES = $(gdbus_sessionbus_sources) dbus-appinfo.c