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

[Simon McVittie]

Module: telepathy-haze
Branch: next
Commit: 3776af1349e456ce9c77cc031552aa1d2044a114
URL:    http://cgit.freedesktop.org/telepathy/telepathy-haze/commit/?id=3776af1349e456ce9c77cc031552aa1d2044a114

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon May 12 09:52:48 2014 +0100

Rename haze-twisted-tests.list to twisted-tests.list

---

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

diff --git a/.gitignore b/.gitignore
index 88e03c0..5f77c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ tags
 /tests/twisted/tools/im.telepathy.v1.ConnectionManager.haze.service
 /tests/twisted/tools/tmp-session-bus.conf
 /tests/twisted/config.py
-/tests/twisted/haze-twisted-tests.list
+/tests/twisted/twisted-tests.list
 /tests/twisted/run-test.sh
 /telepathy-haze*.tar.gz*
 /telepathy-haze*/
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 746b62a..2e4ecc3 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -57,11 +57,11 @@ EXTRA_DIST = \
 	run-test.sh.in \
 	$(NULL)
 
-haze-twisted-tests.list: Makefile
+twisted-tests.list: Makefile
 	$(AM_V_GEN)echo $(TWISTED_TESTS) > $@
 
 built_test_data = \
-	haze-twisted-tests.list \
+	twisted-tests.list \
 	$(NULL)
 
 built_test_scripts = \
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index 5e13882..7a23793 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -33,7 +33,7 @@ config_file="${G_TEST_BUILDDIR}/tools/tmp-session-bus.conf"
 if [ -n "$1" ] ; then
   list="$1"
 else
-  list=$(cat "${G_TEST_BUILDDIR}"/haze-twisted-tests.list)
+  list=$(cat "${G_TEST_BUILDDIR}"/twisted-tests.list)
 fi
 
 any_failed=0