summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-26 12:37:07 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-26 12:38:23 +0000
commit62a9165d8d02a2cde8d432381381cf8676bfdbf7 (patch)
tree470cc478b25f1c5e251c94fc57107eece74499b5
parentfd617b3eb50bdf9b5e54901681e1408aa0949354 (diff)
Replace GABBLE_TEST_SLEEP with CHECK_TWISTED_SLEEP
-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 c1a0b4a40..2706e7c6d 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -284,7 +284,7 @@ if WANT_TWISTED_TESTS
fi; \
failed=0; \
GABBLE_TEST_UNINSTALLED=1 \
- GABBLE_TEST_SLEEP="--sleep=$$sleep" \
+ CHECK_TWISTED_SLEEP="--sleep=$$sleep" \
G_TEST_SRCDIR=@abs_srcdir@ \
G_TEST_BUILDDIR=@abs_builddir@ \
sh run-test.sh "$(TWISTED_TESTS)" || failed=1; \
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index 20dafc085..b3a6fc8c8 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -44,7 +44,7 @@ any_failed=0
for i in $list ; do
echo "Testing $i ..."
sh "${G_TEST_SRCDIR}/tools/with-session-bus.sh" \
- ${GABBLE_TEST_SLEEP} \
+ ${CHECK_TWISTED_SLEEP} \
--config-file="${config_file}" \
-- \
@TEST_PYTHON@ -u "${G_TEST_SRCDIR}/$i"