Simplify srcdir/builddir location

2 files changed, 19 insertions, 20 deletions

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 682e79bf..d764afee 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -74,8 +74,8 @@ check-twisted: $(BUILT_SOURCES)
 		salut_test_sleep=--sleep=$(CHECK_TWISTED_SLEEP); \
 	fi; \
 	CHECK_TWISTED_UNINSTALLED=1 \
-	  SALUT_ABS_TOP_SRCDIR=@abs_top_srcdir@ \
-	  SALUT_ABS_TOP_BUILDDIR=@abs_top_builddir@ \
+	  G_TEST_SRCDIR=@abs_srcdir@ \
+	  G_TEST_BUILDDIR=@abs_builddir@ \
 	  CHECK_TWISTED_SLEEP=$$salut_test_sleep \
 	  ./run-test.sh "$(TWISTED_TESTS)"
 
@@ -110,7 +110,7 @@ endif
 
 run-test.sh: run-test.sh.in Makefile
 	$(AM_V_GEN)sed \
-			-e 's![@]saluttestsdir[@]!${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 f3ca734c..e617f635 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -1,40 +1,39 @@
 #!/bin/sh
 
 if test "x$CHECK_TWISTED_UNINSTALLED" = x; then
-  script_fullname=`readlink -e "@saluttestsdir@/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
 
-  test_src="@saluttestsdir@"
-  test_build="@saluttestsdir@"
-  config_file="@saluttestsdir@/twisted/tools/servicedir/tmp-session-bus.conf"
+  G_TEST_SRCDIR="@twistedtestsdir@"
+  export G_TEST_SRCDIR
+  G_TEST_BUILDDIR="@twistedtestsdir@"
+  export G_TEST_BUILDDIR
 
-  PYTHONPATH="@saluttestsdir@/twisted"
+  PYTHONPATH="${G_TEST_SRCDIR}"
   export PYTHONPATH
 else
-  if test -z "$SALUT_ABS_TOP_SRCDIR"; then
-    echo "SALUT_ABS_TOP_SRCDIR must be set" >&2
+  if ! test -d "$G_TEST_SRCDIR"; then
+    echo "G_TEST_SRCDIR must be set" >&2
     exit 1
   fi
-  if test -z "$SALUT_ABS_TOP_BUILDDIR"; then
-    echo "SALUT_ABS_TOP_BUILDDIR must be set" >&2
+  if ! test -d "$G_TEST_BUILDDIR"; then
+    echo "G_TEST_BUILDDIR must be set" >&2
     exit 1
   fi
 
-  test_src="${SALUT_ABS_TOP_SRCDIR}/tests"
-  test_build="${SALUT_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/twisted-tests.list)
+  list=$(cat "${G_TEST_BUILDDIR}"/twisted-tests.list)
 fi
 
 if [ -z "$SALUT_TEST_REAL_AVAHI" ]; then
@@ -44,12 +43,12 @@ 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}" \
     ${also_for_system} \
     -- \
-    @TEST_PYTHON@ -u "${test_src}/twisted/$i"
+    @TEST_PYTHON@ -u "${G_TEST_SRCDIR}/$i"
   e=$?
   case "$e" in
     (0)