[next] telepathy-haze: Rename HAZE_TEST_SLEEP to CHECK_TWISTED_SLEEP

Simon McVittie smcv at kemper.freedesktop.org
Mon May 12 02:03:36 PDT 2014


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

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

Rename HAZE_TEST_SLEEP to CHECK_TWISTED_SLEEP

---

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

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 6f1570a..c6ff6e3 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -39,7 +39,7 @@ check-twisted: $(BUILT_SOURCES)
 	CHECK_TWISTED_UNINSTALLED=1 \
 	  HAZE_ABS_TOP_SRCDIR=@abs_top_srcdir@ \
 	  HAZE_ABS_TOP_BUILDDIR=@abs_top_builddir@ \
-	  HAZE_TEST_SLEEP=$$haze_test_sleep \
+	  CHECK_TWISTED_SLEEP=$$haze_test_sleep \
 	  ./run-test.sh "$(TWISTED_TESTS)"
 
 dist_test_data = \
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index dbd9994..c7b2ba2 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -47,7 +47,7 @@ any_failed=0
 for i in $list ; do
   echo "Testing $i ..."
   sh "${test_src}/twisted/tools/with-session-bus.sh" \
-    ${HAZE_TEST_SLEEP} \
+    ${CHECK_TWISTED_SLEEP} \
     --config-file="${config_file}" \
     -- \
     @TEST_PYTHON@ -u "${test_src}/twisted/$i"



More information about the telepathy-commits mailing list