summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2015-11-12 12:49:46 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2015-11-12 12:49:46 +0100
commit034b462fd409d9bb10cd26250385aaa316c9ffd5 (patch)
treeb96bca3d29678e5f78069e944f13ef889929a272
parentb4cb853e9139569137e5749add4a4e6edb85df4d (diff)
downloaddbus-034b462fd409d9bb10cd26250385aaa316c9ffd5.tar.gz
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>
-rw-r--r--bus/dispatch.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c
index c413f100..c69b4811 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,