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>

diff --git a/test/Makefile.am b/test/Makefile.am
index 1a43c071b859d2d90e08a2fd2fddd2ea1135fd1a..9540a2c105167e1cdd3d12a0ed9eee6566225013 100644 (file)
--- 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 667f72a44dac3678b30a9ef092ec26fad7c4721d..a40c30b7868e8fc745b7b5292ce61b3a4b580674 100644 (file)
--- 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)
     {