[next] telepathy-rakia: Pass G_TEST_SRCDIR, G_TEST_BUILDDIR in environment

[Simon McVittie]

Module: telepathy-rakia
Branch: next
Commit: 2ddf9211f9fd991daef340b487e2905b7208281d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=2ddf9211f9fd991daef340b487e2905b7208281d

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May  7 11:15:23 2014 +0100

Pass G_TEST_SRCDIR, G_TEST_BUILDDIR in environment

---

 tests/twisted/Makefile.am    |    4 ++--
 tests/twisted/run-test.sh.in |   13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 1c60b9e..f10b11e 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -29,8 +29,8 @@ check-twisted: $(BUILT_SOURCES)
 		rakia_test_sleep=--sleep=$(CHECK_TWISTED_SLEEP); \
 	fi; \
 	CHECK_TWISTED_UNINSTALLED=1 \
-	  RAKIA_ABS_TOP_SRCDIR=@abs_top_srcdir@ \
-	  RAKIA_ABS_TOP_BUILDDIR=@abs_top_builddir@ \
+	  G_TEST_SRCDIR=@abs_srcdir@ \
+	  G_TEST_BUILDDIR=@abs_builddir@ \
 	  CHECK_TWISTED_SLEEP=$$rakia_test_sleep \
 	  ./run-test.sh "$(TWISTED_TESTS)"
 
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index ca99604..67c6aa1 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -15,20 +15,15 @@ if test "x$CHECK_TWISTED_UNINSTALLED" = x; then
   PYTHONPATH="${G_TEST_SRCDIR}"
   export PYTHONPATH
 else
-  if test -z "$RAKIA_ABS_TOP_SRCDIR"; then
-    echo "RAKIA_ABS_TOP_SRCDIR must be set" >&2
+  if ! test -d "$G_TEST_SRCDIR"; then
+    echo "G_TEST_SRCDIR must be set and absolute" >&2
     exit 1
   fi
-  if test -z "$RAKIA_ABS_TOP_BUILDDIR"; then
-    echo "RAKIA_ABS_TOP_BUILDDIR must be set" >&2
+  if ! test -d "$G_TEST_BUILDDIR"; then
+    echo "G_TEST_BUILDDIR must be set and absolute" >&2
     exit 1
   fi
 
-  G_TEST_SRCDIR="${RAKIA_ABS_TOP_SRCDIR}/tests/twisted"
-  export G_TEST_SRCDIR
-  G_TEST_BUILDDIR="${RAKIA_ABS_TOP_BUILDDIR}/tests/twisted"
-  export G_TEST_BUILDDIR
-
   PYTHONPATH="${G_TEST_SRCDIR}:${G_TEST_BUILDDIR}"
   export PYTHONPATH
 fi