From 163937667169b90eb7eb855b05e1b15c5a6a40eb Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 6 Jun 2011 15:57:45 +0100 Subject: [PATCH 2/5] dbus tests: don't warn on skipped tests We should treat _dbus_warn as fatal when we run tests, like bus/ does. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405 --- dbus/dbus-message-util.c | 4 ++-- dbus/dbus-test.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c index e06886a..f785952 100644 --- a/dbus/dbus-message-util.c +++ b/dbus/dbus-message-util.c @@ -619,8 +619,8 @@ process_test_subdir (const DBusString *test_base_dir, { if (_dbus_string_ends_with_c_str (&filename, ".message")) { - _dbus_warn ("Could not load %s, message builder language no longer supported\n", - _dbus_string_get_const_data (&filename)); + printf ("SKIP: Could not load %s, message builder language no longer supported\n", + _dbus_string_get_const_data (&filename)); } _dbus_verbose ("Skipping non-.message file %s\n", diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c index deb4c93..1fbaf8c 100644 --- a/dbus/dbus-test.c +++ b/dbus/dbus-test.c @@ -135,7 +135,7 @@ dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *speci check_memleaks (); #else - _dbus_warn ("recursive marshal tests disabled\n"); + printf ("SKIP: recursive marshal tests disabled\n"); #endif run_test ("byteswap", specific_test, _dbus_marshal_byteswap_test); -- 1.7.5.3