mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-01 23:08:12 +02:00
6868076e3c
Running `make check` on systems without running dbus failed
in test-remote-settings-client.c:383
make[4]: Entering directory `/tmp/NetworkManager/libnm-glib/tests'
/tmp/NetworkManager/libnm-glib/tests/test-remote-settings-client /tmp/NetworkManager/libnm-glib/tests test-remote-settings-service.py
** (/tmp/NetworkManager/libnm-glib/tests/.libs/lt-test-remote-settings-client:26983): WARNING **: Error connecting to D-Bus: Unable to autolaunch a dbus-daemon without a $DISPLAY for X11
make[4]: *** [check-local] Trace/breakpoint trap (core dumped)
Modify the Makefile to start the dbus-daemon, if it is not yet
running.
Signed-off-by: Thomas Haller <thaller@redhat.com>
38 lines
972 B
Makefile
38 lines
972 B
Makefile
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)/libnm-glib \
|
|
$(GLIB_CFLAGS) \
|
|
$(DBUS_CFLAGS)
|
|
|
|
noinst_PROGRAMS = test-remote-settings-client
|
|
|
|
####### remote settings client test #######
|
|
|
|
test_remote_settings_client_SOURCES = \
|
|
test-remote-settings-client.c
|
|
|
|
test_remote_settings_client_LDADD = \
|
|
$(top_builddir)/libnm-util/libnm-util.la \
|
|
$(top_builddir)/libnm-glib/libnm-glib-test.la \
|
|
$(GLIB_LIBS) \
|
|
$(DBUS_LIBS)
|
|
|
|
###########################################
|
|
|
|
TEST_RSS_BIN = test-remote-settings-service.py
|
|
|
|
EXTRA_DIST = $(TEST_RSS_BIN)
|
|
|
|
check-local: test-remote-settings-client
|
|
if test -z "$$DBUS_SESSION_BUS_ADDRESS" ; then \
|
|
dbus-launch --exit-with-session $(abs_builddir)/test-remote-settings-client $(abs_srcdir) $(TEST_RSS_BIN); \
|
|
else \
|
|
$(abs_builddir)/test-remote-settings-client $(abs_srcdir) $(TEST_RSS_BIN); \
|
|
fi;
|
|
|
|
endif
|