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 /tools | |
| parent | b065413b0e9684fc991bf528fa6ab7175bb04888 (diff) | |
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 'tools')
| -rw-r--r-- | tools/dbus-launch.c | 6 | ||||
| -rwxr-xr-x | tools/run-with-tmp-session-bus.sh | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index 0f1e6ede..1b655027 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -1169,10 +1169,10 @@ main (int argc, char **argv) #ifdef DBUS_ENABLE_EMBEDDED_TESTS { - const char *test_daemon; /* exec from testdir */ - if (getenv ("DBUS_USE_TEST_BINARY") != NULL && - (test_daemon = getenv ("DBUS_TEST_DAEMON")) != NULL) + const char *test_daemon = getenv ("DBUS_TEST_DAEMON"); + + if (test_daemon != NULL) { if (config_file == NULL && getenv ("DBUS_TEST_DATA") != NULL) { diff --git a/tools/run-with-tmp-session-bus.sh b/tools/run-with-tmp-session-bus.sh index 94ae8fc8..688f9e48 100755 --- a/tools/run-with-tmp-session-bus.sh +++ b/tools/run-with-tmp-session-bus.sh @@ -45,11 +45,6 @@ export LD_LIBRARY_PATH unset DBUS_SESSION_BUS_ADDRESS unset DBUS_SESSION_BUS_PID -# this does not actually affect dbus-run-session any more, but could be -# significant for dbus-launch as used by the autolaunch test -DBUS_USE_TEST_BINARY=1 -export DBUS_USE_TEST_BINARY - $DBUS_TOP_BUILDDIR/tools/dbus-run-session \ --config-file="$CONFIG_FILE" \ --dbus-daemon="$DBUS_TOP_BUILDDIR/bus/dbus-daemon" \ |