dbus tests: don't warn on skipped tests
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 6 Jun 2011 14:57:45 +0000 (15:57 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 18 Jul 2011 18:14:52 +0000 (19:14 +0100)
We should treat _dbus_warn as fatal when we run tests, like bus/ does.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
dbus/dbus-message-util.c
dbus/dbus-test.c

index e06886a..f785952 100644 (file)
@@ -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",
index deb4c93..1fbaf8c 100644 (file)
@@ -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);