2003-03-13 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-timeout.c (_dbus_timeout_list_set_functions): handle
	out of memory

	* dbus/dbus-watch.c (_dbus_watch_list_set_functions): handle out
	of memory

	* dbus/dbus-connection.h: Make AddWatchFunction and
	AddTimeoutFunction return a bool so they can fail on out-of-memory

	* bus/bus.c (bus_context_new): set up timeout handlers

	* bus/connection.c (bus_connections_setup_connection): set up
	timeout handlers

	* glib/dbus-gmain.c: adapt to the fact that set_functions stuff
	can fail

	* bus/bus.c (bus_context_new): adapt to changes

	* bus/connection.c: adapt to changes

	* test/watch.c: adapt to DBusWatch changes

	* bus/dispatch.c (bus_dispatch_test): started adding this but
	didn't finish

1 files changed, 25 insertions, 0 deletions

diff --git a/bus/test-main.c b/bus/test-main.c
index 27c06f48..503d996d 100644
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -22,16 +22,41 @@
  */
 
 #include "test.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <dbus/dbus-string.h>
+#include <dbus/dbus-sysdeps.h>
+
+static void
+die (const char *failure)
+{
+  fprintf (stderr, "Unit test failed: %s\n", failure);
+  exit (1);
+}
 
 int
 main (int argc, char **argv)
 {
 #ifdef DBUS_BUILD_TESTS
+  const char *dir;
+  DBusString test_data_dir;
+
+  if (argc > 1)
+    dir = argv[1];
+  else
+    dir = _dbus_getenv ("DBUS_TEST_DATA");
+
+  if (dir == NULL)
+    dir = "";
 
+  _dbus_string_init_const (&test_data_dir, dir);
   
+  if (!bus_dispatch_test (&test_data_dir))
+    die ("dispatch");
   
   return 0;
 #else /* DBUS_BUILD_TESTS */
+      
   return 0;
 #endif
 }