diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-10-02 09:34:48 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-10-04 08:17:54 +0100 |
| commit | 87db372c2f9e3c8401f0c8e6e3d20106d168e9a2 (patch) | |
| tree | c60cfc00ab409d80a57cccb37e39c3c75aa635e6 | |
| parent | c5c747dd7613d777a05ddb663409eeea4e61ec74 (diff) | |
| download | dbus-87db372c2f9e3c8401f0c8e6e3d20106d168e9a2.tar.gz | |
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
| -rw-r--r-- | bus/activation-helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |