From 3da9815113c013c3e81f4290d9b74d9862004027 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Sun, 20 Dec 2009 10:45:08 +0100 Subject: [PATCH] win32 fix: disabled some tests, they may be not intendent for windows or need to be implemented --- bus/dispatch.c | 5 +++++ dbus/dbus-memory.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bus/dispatch.c b/bus/dispatch.c index f769a44d0..9b5e65ab2 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -4536,11 +4536,16 @@ bus_dispatch_test_conf (const DBusString *test_data_dir, if (!check_add_match_all (context, baz)) _dbus_assert_not_reached ("AddMatch message failed"); +#ifdef DBUS_WIN_FIXME + _dbus_warn("TODO: testing of GetConnectionUnixUser message skipped for now\n"); + _dbus_warn("TODO: testing of GetConnectionUnixProcessID message skipped for now\n"); +#else if (!check_get_connection_unix_user (context, baz)) _dbus_assert_not_reached ("GetConnectionUnixUser message failed"); if (!check_get_connection_unix_process_id (context, baz)) _dbus_assert_not_reached ("GetConnectionUnixProcessID message failed"); +#endif if (!check_list_services (context, baz)) _dbus_assert_not_reached ("ListActivatableNames message failed"); diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c index 5e93c0474..0ceac666b 100644 --- a/dbus/dbus-memory.c +++ b/dbus/dbus-memory.c @@ -244,7 +244,11 @@ dbus_bool_t _dbus_decrement_fail_alloc_counter (void) { _dbus_initialize_malloc_debug (); - +#ifdef DBUS_WIN_FIXME + _dbus_warn("disabled memory allocation errors for now, it makes testing much more complicated"); + return FALSE; +#endif + if (fail_alloc_counter <= 0) { if (backtrace_on_fail_alloc) -- 2.47.3