mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-18 04:48:06 +02:00
29c71168cd
* dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket) (_dbus_transport_new_for_tcp_socket): these didn't need the "server" argument since they are always client side * dbus/dbus-server.c (dbus_server_get_address): new function * bus/main.c (main): take the configuration file as an argument. * test/data/valid-config-files/debug-allow-all.conf: new file to use with dispatch.c tests for example * bus/test-main.c (main): require test data dir * bus/bus.c (bus_context_new): change this to take a configuration file name as argument * doc/config-file.txt (Elements): add <servicedir> * bus/system.conf, bus/session.conf: new files * dbus/dbus-bus.c (dbus_bus_get): look for system bus on well-known socket if none set * configure.in: create system.conf and session.conf
67 lines
1.8 KiB
Makefile
67 lines
1.8 KiB
Makefile
|
|
INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS)
|
|
|
|
if DBUS_BUILD_TESTS
|
|
TEST_BINARIES=echo-client echo-server unbase64 break-loader spawn-test
|
|
else
|
|
TEST_BINARIES=
|
|
endif
|
|
|
|
noinst_PROGRAMS= $(TEST_BINARIES)
|
|
|
|
echo_client_SOURCES= \
|
|
echo-client.c \
|
|
watch.c \
|
|
watch.h
|
|
|
|
echo_server_SOURCES= \
|
|
echo-server.c \
|
|
watch.c \
|
|
watch.h
|
|
|
|
unbase64_SOURCES= \
|
|
unbase64.c
|
|
|
|
# bus_test_SOURCES = \
|
|
# debug-thread.c \
|
|
# debug-thread.h \
|
|
# bus-test.c \
|
|
# bus-test-loop.c \
|
|
# bus-test-loop.h
|
|
|
|
break_loader_SOURCES= \
|
|
break-loader.c
|
|
|
|
spawn_test_SOURCES= \
|
|
spawn-test.c
|
|
|
|
TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la
|
|
|
|
echo_client_LDADD=$(TEST_LIBS)
|
|
echo_server_LDADD=$(TEST_LIBS)
|
|
unbase64_LDADD=$(TEST_LIBS)
|
|
break_loader_LDADD= $(TEST_LIBS)
|
|
#bus_test_LDADD=$(TEST_LIBS) $(top_builddir)/bus/libdbus-daemon.la
|
|
spawn_test_LDADD=$(TEST_LIBS)
|
|
|
|
EXTRA_DIST=fix-standard-tests.sh
|
|
|
|
dist-hook:
|
|
DIRS="data data/valid-messages data/invalid-messages data/incomplete-messages data/auth data/sha-1 data/valid-config-files"; \
|
|
for D in $$DIRS; do \
|
|
test -d $(distdir)/$$D || mkdir $(distdir)/$$D ; \
|
|
done ; \
|
|
FILES=`find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf"` ; \
|
|
for F in $$FILES; do \
|
|
echo '-- Disting file '$$F ; \
|
|
cp $$F $(distdir)/$$F ; \
|
|
done
|
|
|
|
|
|
### we want our standard session.conf and system.conf in the test suite,
|
|
### right now we manually sync copies of them over to the test suite
|
|
### from time to time
|
|
update-standard-tests:
|
|
cp -f $(top_builddir)/bus/system.conf.in data/valid-config-files/system.conf ; \
|
|
cp -f $(top_builddir)/bus/session.conf.in data/valid-config-files/session.conf ; \
|
|
$(srcdir)/fix-standard-tests.sh
|