summaryrefslogtreecommitdiffstats
path: root/bus/utils.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-03-15 06:00:01 +0000
committerHavoc Pennington <hp@redhat.com>2003-03-15 06:00:01 +0000
commitf05f87a825ab8ed5273674a7f65521ffc526f0d2 (patch)
treea4645e057d269b6bc7d2d99e89ba7606625b3686 /bus/utils.c
parent169238e99a4a163c89eb053250daeedf5f73e5cd (diff)
2003-03-15 Havoc Pennington <hp@pobox.com>
* bus/dispatch.c (bus_dispatch_test): OK, now finally actually write useful test code, after all that futzing around ;-) Test does not yet pass because we can't handle OOM in _dbus_transport_messages_pending (basically, dbus_connection_preallocate_send() does not prealloc the write watch). To fix this, I think we need to add new stuff to set_watch_functions, namely a SetEnabled function so we can alloc the watch earlier, then enable it later. * dbus/Makefile.am (libdbus_convenience_la_SOURCES): move dbus-memory.c to the convenience lib * bus/test.c: rename some static functions to keep them clearly distinct from stuff in connection.c. Handle client disconnection.
Diffstat (limited to 'bus/utils.c')
-rw-r--r--bus/utils.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/bus/utils.c b/bus/utils.c
index 8b964cc4..fadfc140 100644
--- a/bus/utils.c
+++ b/bus/utils.c
@@ -22,6 +22,7 @@
*
*/
+#include <config.h>
#include "utils.h"
#include <dbus/dbus-sysdeps.h>
@@ -30,6 +31,11 @@ const char bus_no_memory_message[] = "Memory allocation failure in message bus";
void
bus_wait_for_memory (void)
{
+#ifdef DBUS_BUILD_TESTS
+ /* make tests go fast */
+ _dbus_sleep_milliseconds (10);
+#else
_dbus_sleep_milliseconds (500);
+#endif
}