summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-26 12:39:31 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-26 12:39:31 +0000
commit6be4c4457635cdabf7759cfaaddb7cbd860a9530 (patch)
tree69abb0d65b4ac5bc40010ae462a69cb4ef1c4489
parent62a9165d8d02a2cde8d432381381cf8676bfdbf7 (diff)
Replace GABBLE_TEST_UNINSTALLED with CHECK_TWISTED_UNINSTALLED
-rw-r--r--tests/twisted/Makefile.am2
-rw-r--r--tests/twisted/run-test.sh.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 2706e7c6d..e14dc66f3 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -283,7 +283,7 @@ if WANT_TWISTED_TESTS
sleep=$(CHECK_TWISTED_SLEEP); \
fi; \
failed=0; \
- GABBLE_TEST_UNINSTALLED=1 \
+ CHECK_TWISTED_UNINSTALLED=1 \
CHECK_TWISTED_SLEEP="--sleep=$$sleep" \
G_TEST_SRCDIR=@abs_srcdir@ \
G_TEST_BUILDDIR=@abs_builddir@ \
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index b3a6fc8c8..c14b7beaf 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -1,6 +1,6 @@
#!/bin/sh
-if test "x$GABBLE_TEST_UNINSTALLED" = x; then
+if test "x$CHECK_TWISTED_UNINSTALLED" = x; then
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