From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 2 Nov 2015 18:19:02 +0000 (+0000)
Subject: Don't use _dbus_warn() for intentionally-skipped tests
X-Git-Tag: dbus-1.10.4~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78545a32c57f7b1571dd10e20a049cb0caf705e6;p=thirdparty%2Fdbus.git

Don't use _dbus_warn() for intentionally-skipped tests

The tests are run with _dbus_warn() fatal, so if a particular test is
not applicable on the current platform, we shouldn't call it.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index 738722037..aaaed30d3 100644
--- a/dbus/dbus-auth-script.c
+++ b/dbus/dbus-auth-script.c
@@ -25,6 +25,9 @@
 #ifdef DBUS_ENABLE_EMBEDDED_TESTS
 
 #include "dbus-auth-script.h"
+
+#include <stdio.h>
+
 #include "dbus-auth.h"
 #include "dbus-string.h"
 #include "dbus-hash.h"
@@ -339,7 +342,7 @@ _dbus_auth_script_run (const DBusString *filename)
                                                "UNIX_ONLY"))
         {
           /* skip this file */
-          _dbus_warn ("skipping unix only auth script\n");
+          fprintf (stderr, "skipping unix only auth script\n");
           retval = TRUE;
           goto out;
         }
@@ -355,7 +358,7 @@ _dbus_auth_script_run (const DBusString *filename)
                                                "WIN_ONLY"))
         {
           /* skip this file */
-          _dbus_warn ("skipping windows only auth script\n");
+          fprintf (stderr, "skipping windows only auth script\n");
           retval = TRUE;
           goto out;
         }