[next] telepathy-mission-control: Rename mc-twisted-tests.list to twisted-tests.

[Simon McVittie]

Module: telepathy-mission-control
Branch: next
Commit: 80a80392a9efdf33b150ca539705179b1fb6d613
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=80a80392a9efdf33b150ca539705179b1fb6d613

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

Rename mc-twisted-tests.list to twisted-tests.

It goes in an MC-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 f2dd50a..d6bd363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,7 +86,7 @@ tests/twisted/with-session-bus-*.dbus-monitor-logs
 /tests/twisted/accounts/.mc6_connections
 /tests/twisted/accounts/accounts.cfg
 /tests/twisted/mc-debug-server
-tests/twisted/mc-twisted-tests.list
+tests/twisted/twisted-tests.list
 tests/twisted/run-test.sh
 tests/twisted/tools/exec-with-log.sh
 tests/twisted/tools/missioncontrol-*.log
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 4854891..c09a6d3 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -116,7 +116,7 @@ TWISTED_OTHER_FILES = \
 
 # This deliberately doesn't include the TWISTED_SPECIAL_BUILD_TESTS
 # since it's testing the real binary, not the "debug" binary.
-mc-twisted-tests.list:
+twisted-tests.list:
 	$(AM_V_GEN)echo $(TWISTED_BASIC_TESTS) $(TWISTED_SEPARATE_TESTS) > $@
 
 %.test: Makefile
@@ -154,7 +154,7 @@ nobase_dist_twistedtests_DATA = \
 	$(NULL)
 nobase_nodist_twistedtests_DATA = \
 	config.py \
-	mc-twisted-tests.list \
+	twisted-tests.list \
 	$(NULL)
 endif
 
@@ -171,7 +171,7 @@ config.py: Makefile
 
 BUILT_SOURCES = \
 	config.py \
-	mc-twisted-tests.list \
+	twisted-tests.list \
 	run-test.sh \
 	$(NULL)
 
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index 0c057af..162553d 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -76,7 +76,7 @@ export MC_MANAGER_DIR
 if [ -n "$1" ] ; then
   list="$1"
 else
-  list=$(cat "${G_TEST_BUILDDIR}"/mc-twisted-tests.list)
+  list=$(cat "${G_TEST_BUILDDIR}"/twisted-tests.list)
 fi
 
 n=0