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
This commit is contained in:
Simon McVittie 2012-10-02 09:34:48 +01:00
parent 40cc5ebd4a
commit 62aec8838a

View file

@ -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;
}