diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-02 18:57:16 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-03 21:11:43 +0100 |
| commit | 64faf70403c67e706892ad05d6a55e23ec47f01b (patch) | |
| tree | f2d6fde5a70c1939e2cdcc3e085251a856d660f6 | |
| parent | d4e9757262f33a62c5e9635478f66ecaa973d9bd (diff) | |
| download | telepathy-idle-64faf70403c67e706892ad05d6a55e23ec47f01b.tar.gz | |
Substitute twistedtestsdir in run-test.sh
Another point of unnecessary divergence.
| -rw-r--r-- | tests/twisted/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/twisted/run-test.sh.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index dca17d5..78551e6 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -88,7 +88,7 @@ endif run-test.sh: run-test.sh.in Makefile $(AM_V_GEN)sed \ - -e 's![@]idletestsdir[@]!${testsdir}!' \ + -e 's![@]twistedtestsdir[@]!${twistedtestsdir}!' \ -e 's![@]TEST_PYTHON[@]!$(TEST_PYTHON)!' \ < $< > $@.tmp && \ chmod +x $@.tmp && \ diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in index f231a73..4325527 100644 --- a/tests/twisted/run-test.sh.in +++ b/tests/twisted/run-test.sh.in @@ -1,15 +1,15 @@ #!/bin/sh if test "x$CHECK_TWISTED_UNINSTALLED" = x; then - script_fullname=`readlink -e "@idletestsdir@/twisted/run-test.sh"` + script_fullname=`readlink -e "@twistedtestsdir@/run-test.sh"` if [ `readlink -e "$0"` != "$script_fullname" ] ; then echo "This script is meant to be installed at $script_fullname" >&2 exit 1 fi - G_TEST_SRCDIR="@idletestsdir@/twisted" + G_TEST_SRCDIR="@twistedtestsdir@" export G_TEST_SRCDIR - G_TEST_BUILDDIR="@idletestsdir@/twisted" + G_TEST_BUILDDIR="@twistedtestsdir@" export G_TEST_BUILDDIR PYTHONPATH="${G_TEST_SRCDIR}" |