From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 27 May 2015 10:42:44 +0000 (+0100)
Subject: tests: use the new bus setup for `make installcheck`
X-Git-Tag: dbus-1.9.18~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54357a96923de7c3f15c26c27901a086a0ed84a3;p=thirdparty%2Fdbus.git

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 1a43c071b..9540a2c10 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 667f72a44..a40c30b78 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)
     {