diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-03 14:45:35 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-04 17:15:36 +0000 |
commit | 94610d7de6c9a00729a53c4bc9f6517c62696732 (patch) | |
tree | 5ae63202bb93d0f500b5194cd13942fc6a3e4f51 /test/internals | |
parent | 1a28f82926c31ae17b8688bdeb6d68f29d628592 (diff) | |
download | dbus-94610d7de6c9a00729a53c4bc9f6517c62696732.tar.gz |
Add a common test_init() for GLib tests which prevents hanging forever
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46787
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Diffstat (limited to 'test/internals')
-rw-r--r-- | test/internals/refs.c | 5 | ||||
-rw-r--r-- | test/internals/syslog.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/internals/refs.c b/test/internals/refs.c index 85cb3bc0..7eae44e1 100644 --- a/test/internals/refs.c +++ b/test/internals/refs.c @@ -35,7 +35,7 @@ #include <dbus/dbus-message-internal.h> #include <dbus/dbus-pending-call-internal.h> #include <dbus/dbus-server-protected.h> -#include "test-utils.h" +#include "test-utils-glib.h" static void assert_no_error (const DBusError *e) @@ -585,8 +585,7 @@ int main (int argc, char **argv) { - g_test_init (&argc, &argv, NULL); - g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id="); + test_init (&argc, &argv); g_test_add ("/refs/connection", Fixture, NULL, setup_connection, test_connection, teardown); diff --git a/test/internals/syslog.c b/test/internals/syslog.c index 80a0cebb..805c5784 100644 --- a/test/internals/syslog.c +++ b/test/internals/syslog.c @@ -33,6 +33,8 @@ #include <dbus/dbus.h> #include <dbus/dbus-sysdeps.h> +#include "test-utils-glib.h" + typedef struct { int dummy; } Fixture; @@ -93,8 +95,7 @@ int main (int argc, char **argv) { - g_test_init (&argc, &argv, NULL); - g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id="); + test_init (&argc, &argv); g_test_add ("/syslog", Fixture, NULL, setup, test_syslog, teardown); |