diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-08 20:09:58 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2016-02-11 02:37:11 +0100 |
| commit | 8fd2be6013e3d0ff6a6ff63ea022f9606d9a87c6 (patch) | |
| tree | 8f21972f180dad94f96965bcfddf784b2e176a0a /dbus/dbus-sysdeps-unix.c | |
| parent | b065413b0e9684fc991bf528fa6ab7175bb04888 (diff) | |
| download | dbus-8fd2be6013e3d0ff6a6ff63ea022f9606d9a87c6.tar.gz | |
Replace $DBUS_USE_TEST_BINARY with $DBUS_TEST_DBUS_LAUNCH
Instead of using $DBUS_USE_TEST_BINARY to control whether to use the
hard-coded test binary TEST_BUS_LAUNCH_BINARY, we can just use
$DBUS_TEST_DBUS_LAUNCH to control what we launch directly, as we
were already doing for $DBUS_TEST_DAEMON.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92899
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'dbus/dbus-sysdeps-unix.c')
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 50ca60a2..f0fca85e 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -3671,7 +3671,7 @@ _dbus_get_autolaunch_address (const char *scope, * but that's done elsewhere, and if it worked, this function wouldn't * be called.) */ const char *display; - char *progpath; + const char *progpath; char *argv[6]; int i; DBusString uuid; @@ -3716,9 +3716,9 @@ _dbus_get_autolaunch_address (const char *scope, } #ifdef DBUS_ENABLE_EMBEDDED_TESTS - if (_dbus_getenv ("DBUS_USE_TEST_BINARY") != NULL) - progpath = TEST_BUS_LAUNCH_BINARY; - else + progpath = _dbus_getenv ("DBUS_TEST_DBUS_LAUNCH"); + + if (progpath == NULL) #endif progpath = DBUS_BINDIR "/dbus-launch"; /* |