From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 12 Nov 2015 11:49:46 +0000 (+0100)
Subject: Skip launch helper activation tests on windows silently.
X-Git-Tag: dbus-1.10.4~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=034b462fd409d9bb10cd26250385aaa316c9ffd5;p=thirdparty%2Fdbus.git

Skip launch helper activation tests on windows silently.

The system bus is unsupported there and Windows does not
have any concept of setuid binaries, so it can't ever
actually work.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/bus/dispatch.c b/bus/dispatch.c
index c413f100f..c69b48110 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -4977,9 +4977,7 @@ bus_dispatch_test (const DBusString *test_data_dir)
   			       "valid-config-files/debug-allow-all.conf", FALSE))
     return FALSE;
 
-#ifdef DBUS_WIN
-  _dbus_warn("Info: Launch helper activation tests skipped because launch-helper is not supported yet\n");
-#else
+#ifndef DBUS_WIN
   /* run launch-helper activation tests */
   _dbus_verbose ("Launch helper activation tests\n");
   if (!bus_dispatch_test_conf (test_data_dir,