Commit 54357a96 authored by Simon McVittie's avatar Simon McVittie

tests: use the new bus setup for `make installcheck`

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89280Reviewed-by: default avatarDimitri John Ledkov <dimitri.j.ledkov@intel.com>
parent 54f94fce
......@@ -169,7 +169,7 @@ installcheck_environment = \
export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \
export DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT); \
export DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus; \
export DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir); \
export DBUS_TEST_DATADIR=$(DESTDIR)$(datadir); \
${NULL}
AM_TESTS_ENVIRONMENT = \
......
......@@ -240,10 +240,10 @@ test_get_dbus_daemon (const gchar *config_file,
"--config-file=%s/%s",
g_getenv ("DBUS_TEST_DATA"), config_file);
}
else if (g_getenv ("DBUS_TEST_SYSCONFDIR") != NULL)
else if (g_getenv ("DBUS_TEST_DATADIR") != NULL)
{
arg = g_strdup_printf ("--config-file=%s/dbus-1/session.conf",
g_getenv ("DBUS_TEST_SYSCONFDIR"));
g_getenv ("DBUS_TEST_DATADIR"));
}
else if (g_getenv ("DBUS_TEST_DATA") != NULL)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment