summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Andrieu <oliv__a@users.sourceforge.net>2004-04-13 22:29:50 +0000
committerOlivier Andrieu <oliv__a@users.sourceforge.net>2004-04-13 22:29:50 +0000
commit61b294f1a9e41c68486bc9340cd42d94224a4080 (patch)
tree756d7ad7e1a60052e857336d98ddd235d0f07af5
parentfefa7ed4d59f69eca45b51dc4a120993c87c218e (diff)
2004-04-14 Olivier Andrieu <oliv__a@users.sourceforge.net>
* test/glib/test-dbus-glib.c (timed_exit): fail the test after a few seconds.
-rw-r--r--ChangeLog5
-rw-r--r--test/glib/test-dbus-glib.c9
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 97594d89..e306348b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-14 Olivier Andrieu <oliv__a@users.sourceforge.net>
+
+ * test/glib/test-dbus-glib.c (timed_exit): fail the test after
+ a few seconds.
+
2004-04-13 Michael Meeks <michael@ximian.com>
* glib/dbus-gobject.c (handle_introspect): split out
diff --git a/test/glib/test-dbus-glib.c b/test/glib/test-dbus-glib.c
index 5cb31235..ed94afae 100644
--- a/test/glib/test-dbus-glib.c
+++ b/test/glib/test-dbus-glib.c
@@ -7,6 +7,13 @@
static GMainLoop *loop = NULL;
static int n_times_foo_received = 0;
+static gboolean
+timed_exit (gpointer loop)
+{
+ g_main_loop_quit (loop);
+ return TRUE;
+}
+
static void
foo_signal_handler (DBusGProxy *proxy,
DBusMessage *signal,
@@ -200,6 +207,8 @@ main (int argc, char **argv)
dbus_connection_flush (connection);
+ g_timeout_add (5000, timed_exit, loop);
+
g_main_loop_run (loop);
if (n_times_foo_received != 1)