[next] telepathy-rakia: Sync tools Makefile from Idle, for installed-tests

[Simon McVittie]

Module: telepathy-rakia
Branch: next
Commit: b11ea25c2ac603c62b2ad6aba04574238240cd31
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=b11ea25c2ac603c62b2ad6aba04574238240cd31

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May  7 11:36:22 2014 +0100

Sync tools Makefile from Idle, for installed-tests

---

 tests/twisted/tools/Makefile.am                    |   34 ++++++++++++++++++--
 .../tools/installed/tmp-session-bus.conf.in        |   12 +++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index 05d9b82..6a6759d 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -3,8 +3,13 @@ exec-with-log.sh: exec-with-log.sh.in
 		-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" $< > $@
 	chmod +x $@
 
-%.conf: %.conf.in
-	sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+servicedir = $(datadir)/dbus-1/services
+
+%.conf: %.conf.in Makefile
+	@$(MKDIR_P) installed
+	sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
+		-e "s|[@]servicedir[@]|$(servicedir)|g" \
+		$< > $@
 
 # We don't use the full filename for the .in because > 99 character filenames
 # in tarballs are non-portable (and automake 1.8 doesn't let us build
@@ -22,12 +27,35 @@ conf_files = $(conf_in_files:.conf.in=.conf)
 
 BUILT_SOURCES = $(service_files) $(conf_files) exec-with-log.sh
 
+dist_test_scripts = \
+	with-session-bus.sh \
+	$(NULL)
+
+dist_test_data = \
+	$(NULL)
+
+built_test_data = \
+	installed/tmp-session-bus.conf \
+	$(NULL)
+
 EXTRA_DIST = \
+	$(dist_test_data) \
+	$(dist_test_scripts) \
 	$(service_in_files) \
 	$(conf_in_files) \
+	installed/tmp-session-bus.conf.in \
 	exec-with-log.sh.in \
-	with-session-bus.sh
+	$(NULL)
 
 CLEANFILES = \
     $(BUILT_SOURCES) \
     rakia-testing.log
+
+if ENABLE_INSTALLED_TESTS
+testsdir = ${datadir}/telepathy-rakia-1-tests
+twistedtestsdir = ${testsdir}/twisted
+twistedtoolsdir = ${twistedtestsdir}/tools
+dist_twistedtools_SCRIPTS = $(dist_test_scripts)
+dist_twistedtools_DATA = $(dist_test_data)
+twistedtools_DATA = $(built_test_data)
+endif
diff --git a/tests/twisted/tools/installed/tmp-session-bus.conf.in b/tests/twisted/tools/installed/tmp-session-bus.conf.in
new file mode 100644
index 0000000..7e4cf62
--- /dev/null
+++ b/tests/twisted/tools/installed/tmp-session-bus.conf.in
@@ -0,0 +1,12 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <type>session</type>
+  <listen>unix:tmpdir=/tmp</listen>
+  <servicedir>@servicedir@</servicedir>
+  <policy context="default">
+    <allow send_destination="*"/>
+    <allow eavesdrop="true"/>
+    <allow own="*"/>
+  </policy>
+</busconfig>