summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/dbus-launch.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 15249759..14fa226d 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -1110,8 +1110,16 @@ main (int argc, char **argv)
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/* exec from testdir */
- if (getenv("DBUS_USE_TEST_BINARY") != NULL)
+ if (getenv ("DBUS_USE_TEST_BINARY") != NULL)
{
+ if (config_file == NULL && getenv ("DBUS_TEST_DATA") != NULL)
+ {
+ ret = asprintf (&config_file, "%s/valid-config-files/session.conf",
+ getenv ("DBUS_TEST_DATA"));
+ }
+ if (ret == -1 && config_file != NULL)
+ free (config_file);
+
execl (TEST_BUS_BINARY,
TEST_BUS_BINARY,
"--fork",