[next] telepathy-salut: Rename some Salut-specific variables

[Simon McVittie]

Module: telepathy-salut
Branch: next
Commit: 3f7434266097ef7d65de2e525e110e1bafc32d34
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=3f7434266097ef7d65de2e525e110e1bafc32d34

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon May 12 10:25:45 2014 +0100

Rename some Salut-specific variables

Remove SALUT_TWISTED_PATH entirely, it is not used.

---

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

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 7f06b5e..adb8664 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -73,10 +73,10 @@ check-twisted: $(BUILT_SOURCES)
 	else \
 		salut_test_sleep=--sleep=$(CHECK_TWISTED_SLEEP); \
 	fi; \
-	SALUT_TEST_UNINSTALLED=1 \
+	CHECK_TWISTED_UNINSTALLED=1 \
 	  SALUT_ABS_TOP_SRCDIR=@abs_top_srcdir@ \
 	  SALUT_ABS_TOP_BUILDDIR=@abs_top_builddir@ \
-	  SALUT_TEST_SLEEP=$$salut_test_sleep \
+	  CHECK_TWISTED_SLEEP=$$salut_test_sleep \
 	  ./run-test.sh "$(TWISTED_TESTS)"
 
 if ENABLE_PLUGINS
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index d517ad7..37322fd 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if test "x$SALUT_TEST_UNINSTALLED" = x; then
+if test "x$CHECK_TWISTED_UNINSTALLED" = x; then
   script_fullname=`readlink -e "@saluttestsdir@/twisted/run-test.sh"`
   if [ `readlink -e "$0"` != "$script_fullname" ] ; then
     echo "This script is meant to be installed at $script_fullname" >&2
@@ -13,9 +13,6 @@ if test "x$SALUT_TEST_UNINSTALLED" = x; then
 
   PYTHONPATH="@saluttestsdir@/twisted"
   export PYTHONPATH
-
-  SALUT_TWISTED_PATH="@saluttestsdir@/twisted"
-  export SALUT_TWISTED_PATH
 else
   if test -z "$SALUT_ABS_TOP_SRCDIR"; then
     echo "SALUT_ABS_TOP_SRCDIR must be set" >&2
@@ -32,9 +29,6 @@ else
 
   PYTHONPATH="${test_src}/twisted:${test_build}/twisted"
   export PYTHONPATH
-
-  SALUT_TWISTED_PATH="${test_src}/twisted"
-  export SALUT_TWISTED_PATH
 fi
 
 if [ -n "$1" ] ; then
@@ -51,7 +45,7 @@ any_failed=0
 for i in $list ; do
   echo "Testing $i ..."
   sh "${test_src}/twisted/tools/with-session-bus.sh" \
-    ${SALUT_TEST_SLEEP} \
+    ${CHECK_TWISTED_SLEEP} \
     --config-file="${config_file}" \
     ${also_for_system} \
     -- \