[next] telepathy-rakia: Use GLib-style G_TEST_SRCDIR, G_TEST_BUILDDIR intermediate variables

[Simon McVittie]

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

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

Use GLib-style G_TEST_SRCDIR, G_TEST_BUILDDIR intermediate variables

---

 tests/twisted/run-test.sh.in |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index 5ac3c76..8a60e3e 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -7,14 +7,16 @@ if test "x$CHECK_TWISTED_UNINSTALLED" = x; then
     exit 1
   fi
 
-  test_src="@rakiatestsdir@"
-  test_build="@rakiatestsdir@"
-  config_file="@rakiatestsdir@/twisted/tools/tmp-session-bus.conf"
+  G_TEST_SRCDIR="@rakiatestsdir@/twisted"
+  export G_TEST_SRCDIR
+  G_TEST_BUILDDIR="@rakiatestsdir@/twisted"
+  export G_TEST_BUILDDIR
+  config_file="${G_TEST_SRCDIR}/tools/tmp-session-bus.conf"
 
-  PYTHONPATH="@rakiatestsdir@/twisted"
+  PYTHONPATH="${G_TEST_SRCDIR}"
   export PYTHONPATH
 
-  RAKIA_TWISTED_PATH="@rakiatestsdir@/twisted"
+  RAKIA_TWISTED_PATH="${G_TEST_SRCDIR}"
   export RAKIA_TWISTED_PATH
 else
   if test -z "$RAKIA_ABS_TOP_SRCDIR"; then
@@ -26,31 +28,33 @@ else
     exit 1
   fi
 
-  test_src="${RAKIA_ABS_TOP_SRCDIR}/tests"
-  test_build="${RAKIA_ABS_TOP_BUILDDIR}/tests"
-  config_file="${test_build}/twisted/tools/tmp-session-bus.conf"
+  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
+  config_file="${G_TEST_BUILDDIR}/tools/tmp-session-bus.conf"
 
-  PYTHONPATH="${test_src}/twisted:${test_build}/twisted"
+  PYTHONPATH="${G_TEST_SRCDIR}:${G_TEST_BUILDDIR}"
   export PYTHONPATH
 
-  RAKIA_TWISTED_PATH="${test_src}/twisted"
+  RAKIA_TWISTED_PATH="${G_TEST_SRCDIR}"
   export RAKIA_TWISTED_PATH
 fi
 
 if [ -n "$1" ] ; then
   list="$1"
 else
-  list=$(cat "${test_build}"/twisted/rakia-twisted-tests.list)
+  list=$(cat "${G_TEST_BUILDDIR}/rakia-twisted-tests.list")
 fi
 
 any_failed=0
 for i in $list ; do
   echo "Testing $i ..."
-  sh "${test_src}/twisted/tools/with-session-bus.sh" \
+  sh "${G_TEST_SRCDIR}/tools/with-session-bus.sh" \
     ${CHECK_TWISTED_SLEEP} \
     --config-file="${config_file}" \
     -- \
-    @TEST_PYTHON@ -u "${test_src}/twisted/$i"
+    @TEST_PYTHON@ -u "${G_TEST_SRCDIR}/$i"
   e=$?
   case "$e" in
     (0)