mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-02-06 04:40:27 +01:00
9c3d566e95
* Land the new message args API and type system. This patch is huge, but the public API change is not really large. The set of D-BUS types has changed somewhat, and the arg "getters" are more geared toward language bindings; they don't make a copy, etc. There are also some known issues. See these emails for details on this huge patch: http://lists.freedesktop.org/archives/dbus/2004-December/001836.html http://lists.freedesktop.org/archives/dbus/2005-January/001922.html * dbus/dbus-marshal-*: all the new stuff * dbus/dbus-message.c: basically rewritten * dbus/dbus-memory.c (check_guards): with "guards" enabled, init freed blocks to be all non-nul bytes so using freed memory is less likely to work right * dbus/dbus-internals.c (_dbus_test_oom_handling): add DBUS_FAIL_MALLOC=N environment variable, so you can do DBUS_FAIL_MALLOC=0 to skip the out-of-memory checking, or DBUS_FAIL_MALLOC=10 to make it really, really, really slow and thorough. * qt/message.cpp: port to the new message args API (operator<<): use str.utf8() rather than str.unicode() (pretty sure this is right from the Qt docs?) * glib/dbus-gvalue.c: port to the new message args API * bus/dispatch.c, bus/driver.c: port to the new message args API * dbus/dbus-string.c (_dbus_string_init_const_len): initialize the "locked" flag to TRUE and align_offset to 0; I guess we never looked at these anyhow, but seems cleaner. * dbus/dbus-string.h (_DBUS_STRING_ALLOCATION_PADDING): move allocation padding macro to this header; use it to implement (_DBUS_STRING_STATIC): ability to declare a static string. * dbus/dbus-message.c (_dbus_message_has_type_interface_member): change to return TRUE if the interface is not set. * dbus/dbus-string.[hc]: move the D-BUS specific validation stuff to dbus-marshal-validate.[hc] * dbus/dbus-marshal-basic.c (_dbus_type_to_string): move here from dbus-internals.c * dbus/Makefile.am: cut over from dbus-marshal.[hc] to dbus-marshal-*.[hc] * dbus/dbus-object-tree.c (_dbus_decompose_path): move this function here from dbus-marshal.c
129 lines
3.5 KiB
Makefile
129 lines
3.5 KiB
Makefile
|
|
if HAVE_GLIB
|
|
GLIB_SUBDIR=glib
|
|
endif
|
|
|
|
SUBDIRS=$(GLIB_SUBDIR)
|
|
DIST_SUBDIRS=glib
|
|
|
|
INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS)
|
|
|
|
|
|
if DBUS_BUILD_TESTS
|
|
## break-loader removed for now
|
|
TEST_BINARIES=test-service spawn-test test-segfault test-exit test-sleep-forever
|
|
else
|
|
TEST_BINARIES=
|
|
endif
|
|
|
|
if DBUS_GCOV_ENABLED
|
|
GCOV_BINARIES=decode-gcov
|
|
else
|
|
GCOV_BINARIES=
|
|
endif
|
|
|
|
noinst_PROGRAMS= $(TEST_BINARIES) $(GCOV_BINARIES)
|
|
|
|
test_service_SOURCES= \
|
|
test-service.c \
|
|
test-utils.c \
|
|
test-utils.h
|
|
|
|
##break_loader_SOURCES= \
|
|
## break-loader.c
|
|
|
|
spawn_test_SOURCES= \
|
|
spawn-test.c
|
|
|
|
test_exit_SOURCES = \
|
|
test-exit.c
|
|
|
|
test_segfault_SOURCES = \
|
|
test-segfault.c
|
|
|
|
test_sleep_forever_SOURCES = \
|
|
test-sleep-forever.c
|
|
|
|
decode_gcov_SOURCES= \
|
|
decode-gcov.c
|
|
|
|
TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la
|
|
|
|
test_service_LDADD=$(TEST_LIBS)
|
|
## break_loader_LDADD= $(TEST_LIBS)
|
|
spawn_test_LDADD=$(TEST_LIBS)
|
|
decode_gcov_LDADD=$(TEST_LIBS)
|
|
|
|
EXTRA_DIST=
|
|
|
|
## keep these in creation order, i.e. uppermost dirs first
|
|
TESTDIRS= \
|
|
data \
|
|
data/valid-messages \
|
|
data/invalid-messages \
|
|
data/incomplete-messages \
|
|
data/auth \
|
|
data/sha-1 \
|
|
data/valid-config-files \
|
|
data/valid-config-files/basic.d \
|
|
data/valid-config-files/system.d \
|
|
data/valid-service-files \
|
|
data/invalid-config-files \
|
|
data/equiv-config-files \
|
|
data/equiv-config-files/basic \
|
|
data/equiv-config-files/basic/basic.d \
|
|
data/equiv-config-files/entities \
|
|
data/equiv-config-files/entities/basic.d
|
|
|
|
|
|
FIND_TESTS=find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
|
|
|
|
dist-hook:
|
|
for D in $(TESTDIRS); do \
|
|
test -d $(distdir)/$$D || mkdir $(distdir)/$$D || exit 1 ; \
|
|
done ; \
|
|
FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in)` ; \
|
|
for F in $$FILES; do \
|
|
echo '-- Disting file '$$F ; \
|
|
cp -f $(srcdir)/$$F $(distdir)/$$F || exit 1 ; \
|
|
done
|
|
|
|
## copy tests to builddir so that generated tests and static tests
|
|
## are all in one place.
|
|
all-local:
|
|
for D in $(TESTDIRS); do \
|
|
test -d $(top_builddir)/test/$$D || mkdir $(top_builddir)/test/$$D || exit 1 ; \
|
|
done ; \
|
|
if ! (test $(srcdir) = . || test $(srcdir) -ef .) ; then \
|
|
FILES=`(cd $(srcdir) && $(FIND_TESTS))` ; \
|
|
for F in $$FILES; do \
|
|
SRC=$(srcdir)/$$F ; \
|
|
DEST=$(top_builddir)/test/$$F ; \
|
|
echo '-- Copying test file '$$F ; \
|
|
cp $$SRC $$DEST || exit 1 ; \
|
|
chmod u+w $$DEST || exit 1 ; \
|
|
done ; \
|
|
else \
|
|
echo '-- No need to copy test data as srcdir = builddir' ; \
|
|
fi ; \
|
|
echo '-- Copying' $(top_builddir)/bus/*.conf 'to test directory' ; \
|
|
cp $(top_builddir)/bus/*.conf $(top_builddir)/test/data/valid-config-files || exit 1 ; \
|
|
chmod u+w $(top_builddir)/test/data/valid-config-files/*.conf || exit 1
|
|
|
|
## this doesn't clean generated test data files when srcdir=builddir
|
|
clean-local:
|
|
if test $(srcdir) != . ; then \
|
|
FILES=`(cd $(top_builddir)/test && $(FIND_TESTS))` ; \
|
|
for F in $$FILES; do \
|
|
DEST=$(top_builddir)/test/$$F ; \
|
|
echo '-- Deleting test file '$$F ; \
|
|
rm $$DEST || exit 1 ; \
|
|
done ; \
|
|
REVERSEDIRS= ; \
|
|
for D in $(TESTDIRS); do \
|
|
REVERSEDIRS="$$D $$REVERSEDIRS" ; \
|
|
done ; \
|
|
for D in $$REVERSEDIRS; do \
|
|
rmdir $(top_builddir)/test/$$D || exit 1 ; \
|
|
done ; \
|
|
fi
|