diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2018-11-20 16:33:57 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-12-11 10:41:07 +0000 |
| commit | d9de6ab21319c848147c0c0891a01cf5f801b9a2 (patch) | |
| tree | 1e43a421d9b8df27e416e67b4ad9e6992f711ced /test/Makefile.am | |
| parent | a7d1e275e7e01da91d584346326e46c469625d69 (diff) | |
| download | dbus-d9de6ab21319c848147c0c0891a01cf5f801b9a2.tar.gz | |
Add build system variable DBUS_NAME_TEST_EXEC to cover differences in executable paths
Autotools creates executable applications in the respective
subdirectory of the build directory, while cmake creates
them in <build-root>/bin.
This leads to different paths in the file created
from org.freedesktop.DBus.TestSuite.PrivServer.service.in,
which are fixed by the new variable.
Bug: https://gitlab.freedesktop.org/dbus/dbus/issues/135
Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
Reviewed-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'test/Makefile.am')
| -rw-r--r-- | test/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 408cf668..baec9639 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -611,6 +611,7 @@ uninstalled-config-local: sed \ -e 's,[@]DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL[@],$(DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL),' \ -e 's,[@]DBUS_SESSION_BUS_LISTEN_ADDRESS[@],$(DBUS_SESSION_BUS_LISTEN_ADDRESS),' \ + -e 's,[@]DBUS_NAME_TEST_EXEC[@],$(DBUS_NAME_TEST_EXEC),' \ -e 's,[@]DBUS_TEST_DATA[@],@abs_builddir@/data,' \ -e 's,[@]DBUS_TEST_EXEC[@],@abs_builddir@,' \ -e 's,[@]DBUS_USER[@],$(DBUS_USER),' \ @@ -628,6 +629,7 @@ if DBUS_ENABLE_INSTALLED_TESTS sed \ -e 's,[@]DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL[@],$(DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL),' \ -e 's,[@]DBUS_SESSION_BUS_LISTEN_ADDRESS[@],$(DBUS_SESSION_BUS_LISTEN_ADDRESS),' \ + -e 's,[@]DBUS_NAME_TEST_EXEC[@],$(DBUS_NAME_TEST_EXEC),' \ -e 's,[@]DBUS_TEST_DATA[@],$(testexecdir)/data,' \ -e 's,[@]DBUS_TEST_EXEC[@],$(testexecdir),' \ -e 's,[@]DBUS_USER[@],$(DBUS_USER),' \ |