[next] telepathy-haze: Replace @hazetestsdir@/ twisted with @twistedtestsdir@

[Simon McVittie]

Module: telepathy-haze
Branch: next
Commit: 17b093f724af367c932631c495be07252924b929
URL:    http://cgit.freedesktop.org/telepathy/telepathy-haze/commit/?id=17b093f724af367c932631c495be07252924b929

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon May 12 09:53:39 2014 +0100

Replace @hazetestsdir@/twisted with @twistedtestsdir@

---

 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 2e4ecc3..8c84690 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -84,7 +84,7 @@ endif
 
 run-test.sh: run-test.sh.in Makefile
 	$(AM_V_GEN)sed \
-			-e 's![@]hazetestsdir[@]!${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 7a23793..296ede3 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 "@hazetestsdir@/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="@hazetestsdir@/twisted"
+  G_TEST_SRCDIR="@twistedtestsdir@"
   export G_TEST_SRCDIR
-  G_TEST_BUILDDIR="@hazetestsdir@/twisted"
+  G_TEST_BUILDDIR="@twistedtestsdir@"
   export G_TEST_BUILDDIR
 
   PYTHONPATH="${G_TEST_SRCDIR}"