From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 2 Oct 2012 08:34:48 +0000 (+0100)
Subject: activation helper: when compiled for tests, do not reset system bus address
X-Git-Tag: dbus-1.6.10~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62aec8838a2d3841c5f1377c6eef429a7df84aed;p=thirdparty%2Fdbus.git

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 <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=52202
---

diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index cbc00d2fb..8d7ae36fb 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;
 }