summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-04-02 18:51:40 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-04-03 21:11:40 +0100
commitd4e9757262f33a62c5e9635478f66ecaa973d9bd (patch)
tree0876c81f439cfdc5d667ba8a77e2353ec70364f8
parented8bc2fbb2916f951f711c9bc22aefdac4a5c1ed (diff)
Rename idle-twisted-tests.list to twisted-tests.list
-rw-r--r--.gitignore2
-rw-r--r--tests/twisted/Makefile.am4
-rw-r--r--tests/twisted/run-test.sh.in2
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 1e7d9b3..952287d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,7 +66,7 @@ tests/*.log
tests/*.trs
tests/twisted/config.py
-tests/twisted/idle-twisted-tests.list
+tests/twisted/twisted-tests.list
tests/twisted/tools/exec-with-log.sh
tests/twisted/tools/idle-testing.log
tests/twisted/tools/im.telepathy.v1.ConnectionManager.idle.service
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 1f79c60..dca17d5 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -61,12 +61,12 @@ check-twisted: $(BUILT_SOURCES)
endif
-idle-twisted-tests.list: Makefile
+twisted-tests.list: Makefile
$(AM_V_GEN)echo $(TWISTED_TESTS) > $@
built_test_data = \
config.py \
- idle-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 ffc7c0c..f231a73 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -39,7 +39,7 @@ export IDLE_HTFU
if [ -n "$1" ] ; then
list="$1"
else
- list=$(cat "${G_TEST_BUILDDIR}"/idle-twisted-tests.list)
+ list=$(cat "${G_TEST_BUILDDIR}"/twisted-tests.list)
fi
any_failed=0