From 03719b6ba4ff8b2a0fbbae25168dafc44a711682 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 2 Oct 2012 09:34:48 +0100 Subject: activation helper: when compiled for tests, do not reset system bus address Otherwise, the tests try to connect to the real system bus, which will often fail - particularly if you run the tests configured for the default /usr/local (with no intention of installing the result), in which case the tests would try to connect to /usr/local/var/run/dbus/system_bus_socket. Reviewed-by: Colin Walters Bug: https://bugs.freedesktop.org/show_bug.cgi?id=52202 --- bus/activation-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bus/activation-helper.c b/bus/activation-helper.c index bfe832ea..65676574 100644 --- a/bus/activation-helper.c +++ b/bus/activation-helper.c @@ -154,11 +154,11 @@ clear_environment (DBusError *error) "could not clear environment\n"); return FALSE; } -#endif /* Ensure the bus is set to system */ _dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS); _dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system"); +#endif return TRUE; } -- cgit v1.2.1