From bdbab1212390d85a82d4195fa67a5c63ac0678cb Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 26 Jul 2007 23:01:14 +0000 Subject: 2007-07-26 Havoc Pennington * bus/config-parser-trivial.c (check_return_values): disable a test that hardcoded the bus user's name * bus/dispatch.c (bus_dispatch_test_conf): remove the "if (!use_launcher)" around the tests, they were only failing because we didn't pass through all the expected errors from the helper. * bus/activation-exit-codes.h (BUS_SPAWN_EXIT_CODE_CHILD_SIGNALED): add a code for child segfaulting (BUS_SPAWN_EXIT_CODE_GENERIC_FAILURE): make "1" be a generic failure code, so if a third party launch helper were written it could just always return 1 on failure. --- test/name-test/test-names.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/name-test/test-names.c b/test/name-test/test-names.c index 48dfe747..f4b0ba08 100644 --- a/test/name-test/test-names.c +++ b/test/name-test/test-names.c @@ -252,7 +252,10 @@ match_acquired_or_lost_signal (DBusConnection *conn, const char *member, const c } static dbus_bool_t -match_name_owner_changed_signal (DBusConnection *conn, const char *bus_name, const char *lost_name, const char *acquired_name) +match_name_owner_changed_signal (DBusConnection *conn, + const char *bus_name, + const char *lost_name, + const char *acquired_name) { int tries; DBusMessage *msg; @@ -322,7 +325,10 @@ match_name_owner_changed_signal (DBusConnection *conn, const char *bus_name, con if (tries == NUM_TRIES_TIL_FAIL) { - fprintf (stderr, "Did not recive the expected NameOwnerChanged signal!!!\n"); + fprintf (stderr, "Did not receive the expected NameOwnerChanged signal, bus_name %s lost_name %s acquired_name %s\n", + bus_name ? bus_name : "(null)", + lost_name ? lost_name : "(null)", + acquired_name ? acquired_name : "(null)"); return FALSE; } -- cgit