summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-09-16 13:32:45 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2015-02-09 14:32:55 +0000
commitb5528d7ff526d700aab5b9e11aed871180d4f81e (patch)
treec83168ab9d5cca7235d847ab16028d971acb6592 /test
parentc0d1ffc09b5b008fe9b3ee09330ad663927669af (diff)
downloaddbus-glib-b5528d7ff526d700aab5b9e11aed871180d4f81e.tar.gz
Require a modern libdbus and a modern GLib
This means we can assume that GLib and libdbus are thread-safe by default. Also explicitly document that the object-mapping layer of dbus-glib is not thread-safe. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64214 Reviewed-by: Colin Walters <walters@verbum.org> [with review comments to be fixed in subsequent commit -smcv]
Diffstat (limited to 'test')
-rw-r--r--test/core/Makefile.am6
1 files changed, 0 insertions, 6 deletions
diff --git a/test/core/Makefile.am b/test/core/Makefile.am
index e4bceb4..2d66355 100644
--- a/test/core/Makefile.am
+++ b/test/core/Makefile.am
@@ -50,7 +50,6 @@ EXTRA_DIST=run-test.sh run-peer-test.sh test-service-glib.xml my-object-marshal.
if DBUS_BUILD_TESTS
-if HAVE_GLIB_THREADS
THREAD_APPS=test-thread-server test-thread-client test-profile
test_thread_server_SOURCES= \
@@ -60,7 +59,6 @@ test_thread_server_SOURCES= \
test_thread_client_SOURCES= \
test-thread-client.c \
test-thread.h
-endif
## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
## build even when not doing "make check"
@@ -183,13 +181,9 @@ CLEANFILES = \
else
### not building tests
-if HAVE_GLIB_THREADS
noinst_PROGRAMS=test-profile
-endif
endif
-if HAVE_GLIB_THREADS
test_profile_SOURCES= \
test-profile.c
-endif