diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-05-27 11:42:44 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-06-17 16:06:53 +0100 |
| commit | 54357a96923de7c3f15c26c27901a086a0ed84a3 (patch) | |
| tree | 922e50c27a5d619f9b58e686c39958dc7bca775a | |
| parent | 54f94fce08ae621c7321f1475d6078e2b5d022eb (diff) | |
| download | dbus-54357a96923de7c3f15c26c27901a086a0ed84a3.tar.gz | |
tests: use the new bus setup for `make installcheck`
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89280
Reviewed-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/test-utils-glib.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 1a43c071..9540a2c1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -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 = \ diff --git a/test/test-utils-glib.c b/test/test-utils-glib.c index 667f72a4..a40c30b7 100644 --- a/test/test-utils-glib.c +++ b/test/test-utils-glib.c @@ -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) { |