[next] telepathy-gabble: Rename gabble-twisted-tests.list to twisted-tests.list

[Simon McVittie]

Module: telepathy-gabble
Branch: next
Commit: 45771c2cfb0f8c78bf875dbae37ea2bfb17ce748
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=45771c2cfb0f8c78bf875dbae37ea2bfb17ce748

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Mar 26 12:40:41 2014 +0000

Rename gabble-twisted-tests.list to twisted-tests.list

It goes in a Gabble-specific directory anyway, so its name is an
unnecessary point of divergence between projects.

---

 .gitignore                   |    2 +-
 tests/twisted/Makefile.am    |    6 +++---
 tests/twisted/run-test.sh.in |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a6bc6e4..fef0533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,7 +85,7 @@ cscope.out
 /tests/test-presence
 /tests/test-tp-error-from-wocky
 /tests/twisted/config.py
-/tests/twisted/gabble-twisted-tests.list
+/tests/twisted/twisted-tests.list
 /tests/twisted/run-test.sh
 /tests/twisted/telepathy-gabble-debug
 /tests/twisted/tools/core.*
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index e14dc66..bc51bbc 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -260,7 +260,7 @@ nobase_dist_twistedtests_DATA = \
 	$(NULL)
 nobase_nodist_twistedtests_DATA = \
 	config.py \
-	gabble-twisted-tests.list \
+	twisted-tests.list \
 	$(installed_conf_files) \
 	$(service_files)
 	$(NULL)
@@ -384,7 +384,7 @@ check_misc_sources = $(TESTS)
 # the following used to be in tools/
 include $(top_srcdir)/tools/check-coding-style.mk
 
-gabble-twisted-tests.list: Makefile
+twisted-tests.list: Makefile
 	$(AM_V_GEN)echo $(TWISTED_TESTS) > $@
 
 run-test.sh: run-test.sh.in Makefile
@@ -444,7 +444,7 @@ BUILT_SOURCES += \
 	$(installed_conf_files) \
 	$(uninstalled_service_files) \
 	$(uninstalled_conf_files) \
-	gabble-twisted-tests.list \
+	twisted-tests.list \
 	run-test.sh \
 	tools/exec-with-log.sh \
 	tools/run-gabble.sh \
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index c14b7be..6e62890 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -37,7 +37,7 @@ fi
 if [ -n "$1" ] ; then
   list="$1"
 else
-  list=$(cat "${G_TEST_BUILDDIR}"/gabble-twisted-tests.list)
+  list=$(cat "${G_TEST_BUILDDIR}"/twisted-tests.list)
 fi
 
 any_failed=0