diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-26 12:41:39 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 09:20:50 +0000 |
| commit | 80a80392a9efdf33b150ca539705179b1fb6d613 (patch) | |
| tree | 7d6e197a9013456026766c38e19f62b9794031ea | |
| parent | a339b11d72a61f0455c3f986cf642a74601b4730 (diff) | |
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.
| -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
@@ -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 48548917..c09a6d3b 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 0c057afc..162553df 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 |