summaryrefslogtreecommitdiff
path: root/test/test-utils-glib.c
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2018-02-01 19:46:28 +0000
committerSimon McVittie <smcv@collabora.com>2018-02-06 18:49:02 +0000
commitf127c8e110faed76039f96dbc53a87f093fea312 (patch)
tree9d4e2a398cb34cdfb22df82c9483874cc35f143e /test/test-utils-glib.c
parent57a0cf1d14c20765bfc7a36234955b14f3811f2a (diff)
downloaddbus-f127c8e110faed76039f96dbc53a87f093fea312.tar.gz
test_try_connect_to_bus: Allow skipping the use of a DBusLoop
DBusLoop isn't thread-safe, so we can't use it to test multi-threaded situations. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=102839 Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com>
Diffstat (limited to 'test/test-utils-glib.c')
-rw-r--r--test/test-utils-glib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-utils-glib.c b/test/test-utils-glib.c
index 48e3e807..a9bbbb26 100644
--- a/test/test-utils-glib.c
+++ b/test/test-utils-glib.c
@@ -346,7 +346,7 @@ test_try_connect_to_bus (TestMainContext *ctx,
g_assert (dbus_bus_get_unique_name (conn) != NULL);
- if (!test_connection_try_setup (ctx, conn))
+ if (ctx != NULL && !test_connection_try_setup (ctx, conn))
{
_DBUS_SET_OOM (&error);
goto fail;