summaryrefslogtreecommitdiff
path: root/test/marshal.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2015-02-03 14:45:35 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2015-02-04 17:15:36 +0000
commit94610d7de6c9a00729a53c4bc9f6517c62696732 (patch)
tree5ae63202bb93d0f500b5194cd13942fc6a3e4f51 /test/marshal.c
parent1a28f82926c31ae17b8688bdeb6d68f29d628592 (diff)
downloaddbus-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/marshal.c')
-rw-r--r--test/marshal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/marshal.c b/test/marshal.c
index d74e7671..3353ec00 100644
--- a/test/marshal.c
+++ b/test/marshal.c
@@ -31,6 +31,8 @@
#include <dbus/dbus.h>
+#include "test-utils-glib.h"
+
typedef struct {
DBusError e;
} Fixture;
@@ -248,7 +250,7 @@ main (int argc,
char *aligned_le_blob;
char *aligned_be_blob;
- g_test_init (&argc, &argv, NULL);
+ test_init (&argc, &argv);
/* We have to pass in a buffer that's at least "default aligned",
* i.e. on GNU systems to 8 or 16. The linker may have only given