move tests tools to tests/twisted/tools

Other CMs store these files there.

https://bugs.freedesktop.org/show_bug.cgi?id=69269

11 files changed, 35 insertions, 38 deletions

diff --git a/.gitignore b/.gitignore
index 1776590..6d8f085 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,8 +32,8 @@ src/telepathy-haze
 src/telepathy-haze.8
 tags
 /tests/haze-testing.log
-/tests/org.freedesktop.Telepathy.ConnectionManager.haze.service
-/tests/tmp-session-bus.conf
+/tests/twisted/tools/org.freedesktop.Telepathy.ConnectionManager.haze.service
+/tests/twisted/tools/tmp-session-bus.conf
 /tests/twisted/config.py
 /telepathy-haze*.tar.gz*
 /telepathy-haze*/
diff --git a/configure.ac b/configure.ac
index c0e50a7..5b08b67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ AC_CONFIG_FILES([Makefile
 		 m4/Makefile
 		 tests/Makefile
 		 tests/twisted/Makefile
+		 tests/twisted/tools/Makefile
 		 tools/Makefile
 		 extensions/Makefile
 		 ])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index edb1084..0677b8f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,32 +3,3 @@ SUBDIRS = .
 if WANT_TWISTED_TESTS
 SUBDIRS += twisted
 endif
-
-%.conf: %.conf.in
-	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|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
-# non-archaic tarballs)
-org.freedesktop.Telepathy.ConnectionManager.%.service: %.service.in
-	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
-		-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" $< > $@
-
-# D-Bus service file for testing
-service_in_files = haze.service.in
-service_files = org.freedesktop.Telepathy.ConnectionManager.haze.service
-
-# D-Bus config file for testing
-conf_in_files = tmp-session-bus.conf.in
-conf_files = $(conf_in_files:.conf.in=.conf)
-
-BUILT_SOURCES = $(service_files) $(conf_files)
-
-EXTRA_DIST = \
-	$(service_in_files) \
-	$(conf_in_files) \
-	exec-with-log.sh
-
-CLEANFILES = \
-    $(BUILT_SOURCES) \
-    haze-testing.log
diff --git a/tests/haze.service.in b/tests/haze.service.in
deleted file mode 100644
index 976f8af..0000000
--- a/tests/haze.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.ConnectionManager.haze
-Exec=@abs_top_srcdir@/tests/exec-with-log.sh @abs_top_srcdir@ @abs_top_builddir@
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index ec838bb..89b9c14 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = tools
+
 TWISTED_TESTS = \
 	avatar-requirements.py \
 	simple-caps.py \
@@ -32,8 +34,8 @@ check-local: check-twisted
 
 check-twisted:
 	rm -f ../haze-testing.log
-	sh $(top_srcdir)/tools/with-session-bus.sh \
-		--config-file=$(top_builddir)/tests/tmp-session-bus.conf \
+	sh $(top_srcdir)/tests/twisted/tools/with-session-bus.sh \
+		--config-file=$(top_builddir)/tests/twisted/tools/tmp-session-bus.conf \
 		-- $(MAKE) check-TESTS \
 			TESTS="$(TWISTED_TESTS)" \
 			TESTS_ENVIRONMENT="$(TESTS_ENVIRONMENT) $(TEST_PYTHON)"
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
new file mode 100644
index 0000000..db691a5
--- /dev/null
+++ b/tests/twisted/tools/Makefile.am
@@ -0,0 +1,24 @@
+%.conf: %.conf.in
+	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|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
+# non-archaic tarballs)
+org.freedesktop.Telepathy.ConnectionManager.%.service: %.service.in
+	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
+		-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" $< > $@
+
+# D-Bus service file for testing
+service_in_files = haze.service.in
+service_files = org.freedesktop.Telepathy.ConnectionManager.haze.service
+
+# D-Bus config file for testing
+conf_in_files = tmp-session-bus.conf.in
+conf_files = $(conf_in_files:.conf.in=.conf)
+
+BUILT_SOURCES = $(service_files) $(conf_files)
+
+EXTRA_DIST = \
+	$(service_in_files) \
+	$(conf_in_files) \
+	exec-with-log.sh
diff --git a/tests/exec-with-log.sh b/tests/twisted/tools/exec-with-log.sh
index 54abf29..54abf29 100755
--- a/tests/exec-with-log.sh
+++ b/tests/twisted/tools/exec-with-log.sh
diff --git a/tests/twisted/tools/haze.service.in b/tests/twisted/tools/haze.service.in
new file mode 100644
index 0000000..8ee3f3a
--- /dev/null
+++ b/tests/twisted/tools/haze.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.ConnectionManager.haze
+Exec=@abs_top_srcdir@/tests/twisted/tools/exec-with-log.sh @abs_top_srcdir@ @abs_top_builddir@
diff --git a/tests/tmp-session-bus.conf.in b/tests/twisted/tools/tmp-session-bus.conf.in
index c73caac..84d8d65 100644
--- a/tests/tmp-session-bus.conf.in
+++ b/tests/twisted/tools/tmp-session-bus.conf.in
@@ -10,7 +10,7 @@
 
   <listen>unix:tmpdir=/tmp</listen>
 
-  <servicedir>@abs_top_builddir@/tests</servicedir>
+  <servicedir>@abs_top_builddir@/tests/twisted/tools</servicedir>
 
   <policy context="default">
     <!-- Allow everything to be sent -->
diff --git a/tools/with-session-bus.sh b/tests/twisted/tools/with-session-bus.sh
index 0afa593..0afa593 100644
--- a/tools/with-session-bus.sh
+++ b/tests/twisted/tools/with-session-bus.sh
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ac54560..715d792 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,4 @@
 EXTRA_DIST = \
-    with-session-bus.sh \
     c-constants-gen.py \
     doc-generator.xsl \
     glib-ginterface-gen.py \