diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-26 12:40:41 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-26 12:40:41 +0000 |
| commit | 45771c2cfb0f8c78bf875dbae37ea2bfb17ce748 (patch) | |
| tree | 3d447410af94cea64c6af62add12ecf15ab9afc4 | |
| parent | 6be4c4457635cdabf7759cfaaddb7cbd860a9530 (diff) | |
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.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | tests/twisted/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/twisted/run-test.sh.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index a6bc6e49f..fef0533de 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 e14dc66f3..bc51bbc3f 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 c14b7beaf..6e62890ae 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 |