fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 04:08:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: use the new bus setup for make installcheck

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89280
Reviewed-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
This commit is contained in:
Simon McVittie 2015-05-27 11:42:44 +01:00
parent 54f94fce08
commit 54357a9692
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/Makefile.am
View file

@ -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 = \

4
test/test-utils-glib.c
View file

@ -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)
{