[next] telepathy-idle: Substitute twistedtestsdir in run-test.sh

[Simon McVittie]

Module: telepathy-idle
Branch: next
Commit: 64faf70403c67e706892ad05d6a55e23ec47f01b
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=64faf70403c67e706892ad05d6a55e23ec47f01b

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Apr  2 18:57:16 2014 +0100

Substitute twistedtestsdir in run-test.sh

Another point of unnecessary divergence.

---

 tests/twisted/Makefile.am    |    2 +-
 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}"