[next] telepathy-haze: Use GLib-style G_TEST_SRCDIR, G_TEST_BUILDDIR

[Simon McVittie]

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

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

Use GLib-style G_TEST_SRCDIR, G_TEST_BUILDDIR

---

 tests/twisted/Makefile.am    |    4 ++--
 tests/twisted/run-test.sh.in |   31 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index c6ff6e3..746b62a 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -37,8 +37,8 @@ check-twisted: $(BUILT_SOURCES)
 		haze_test_sleep=--sleep=$(CHECK_TWISTED_SLEEP); \
 	fi; \
 	CHECK_TWISTED_UNINSTALLED=1 \
-	  HAZE_ABS_TOP_SRCDIR=@abs_top_srcdir@ \
-	  HAZE_ABS_TOP_BUILDDIR=@abs_top_builddir@ \
+	  G_TEST_SRCDIR=@abs_srcdir@ \
+	  G_TEST_BUILDDIR=@abs_builddir@ \
 	  CHECK_TWISTED_SLEEP=$$haze_test_sleep \
 	  ./run-test.sh "$(TWISTED_TESTS)"
 
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index 4a0752a..5e13882 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -7,44 +7,43 @@ if test "x$CHECK_TWISTED_UNINSTALLED" = x; then
     exit 1
   fi
 
-  test_src="@hazetestsdir@"
-  test_build="@hazetestsdir@"
-  config_file="@hazetestsdir@/twisted/tools/servicedir/tmp-session-bus.conf"
+  G_TEST_SRCDIR="@hazetestsdir@/twisted"
+  export G_TEST_SRCDIR
+  G_TEST_BUILDDIR="@hazetestsdir@/twisted"
+  export G_TEST_BUILDDIR
 
-  PYTHONPATH="@hazetestsdir@/twisted"
+  PYTHONPATH="${G_TEST_SRCDIR}"
   export PYTHONPATH
 else
-  if test -z "$HAZE_ABS_TOP_SRCDIR"; then
-    echo "HAZE_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 "$HAZE_ABS_TOP_BUILDDIR"; then
-    echo "HAZE_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
 
-  test_src="${HAZE_ABS_TOP_SRCDIR}/tests"
-  test_build="${HAZE_ABS_TOP_BUILDDIR}/tests"
-  config_file="${test_build}/twisted/tools/tmp-session-bus.conf"
-
-  PYTHONPATH="${test_src}/twisted:${test_build}/twisted"
+  PYTHONPATH="${G_TEST_SRCDIR}:${G_TEST_BUILDDIR}"
   export PYTHONPATH
 fi
 
+config_file="${G_TEST_BUILDDIR}/tools/tmp-session-bus.conf"
+
 if [ -n "$1" ] ; then
   list="$1"
 else
-  list=$(cat "${test_build}"/twisted/haze-twisted-tests.list)
+  list=$(cat "${G_TEST_BUILDDIR}"/haze-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)