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

[platform/upstream/dbus.git] / bus / test.c

diff --git a/bus/test.c b/bus/test.c
index 24cc6ef..d669708 100644 (file)
--- a/bus/test.c
+++ b/bus/test.c
@@ -267,7 +267,6 @@ bus_test_client_listed (DBusConnection *connection)
   return FALSE;
 }
 
-
 void
 bus_test_flush_bus (BusContext *context)
 {
@@ -276,13 +275,69 @@ bus_test_flush_bus (BusContext *context)
    * one end of the debug pipe to come out the other end...
    * a more robust setup would be good. Blocking on the other
    * end of pipes we've pushed data into or something.
+   * A simple hack might be to just make the debug server always
+   * poll for read on the other end of the pipe after writing.
    */
-  
   while (bus_loop_iterate (FALSE))
     ;
+#if 0
   _dbus_sleep_milliseconds (15);
+#endif
   while (bus_loop_iterate (FALSE))
     ;
 }
 
+BusContext*
+bus_context_new_test (const DBusString *test_data_dir,
+                      const char       *filename)
+{
+  DBusError error;
+  DBusString config_file;
+  DBusString relative;
+  BusContext *context;
+  
+  if (!_dbus_string_init (&config_file))
+    {
+      _dbus_warn ("No memory\n");
+      return NULL;
+    }
+
+  if (!_dbus_string_copy (test_data_dir, 0,
+                          &config_file, 0))
+    {
+      _dbus_warn ("No memory\n");
+      _dbus_string_free (&config_file);
+      return NULL;
+    }
+
+  _dbus_string_init_const (&relative, filename);
+
+  if (!_dbus_concat_dir_and_file (&config_file, &relative))
+    {
+      _dbus_warn ("No memory\n");
+      _dbus_string_free (&config_file);
+      return NULL;
+    }
+  
+  dbus_error_init (&error);
+  context = bus_context_new (&config_file, &error);
+  if (context == NULL)
+    {
+      _DBUS_ASSERT_ERROR_IS_SET (&error);
+      
+      _dbus_warn ("Failed to create debug bus context from configuration file %s: %s\n",
+                  filename, error.message);
+
+      dbus_error_free (&error);
+      
+      _dbus_string_free (&config_file);
+      
+      return NULL;
+    }
+
+  _dbus_string_free (&config_file);
+  
+  return context;
+}
+
 #endif