[Pkg-telepathy-commits] [telepathy-mission-control-6] 20/90: Replace MC_ABS_TOP_BUILDDIR, ...SRCDIR with CHECK_TWISTED_ABS_TOP_BUILDDIR, ...SRCDIR

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 3af07d22d072aef63bca297c5e20a59185064100
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Mar 26 12:09:33 2014 +0000

    Replace MC_ABS_TOP_BUILDDIR, ...SRCDIR with CHECK_TWISTED_ABS_TOP_BUILDDIR, ...SRCDIR
---
 tests/twisted/Makefile.am    |  4 ++--
 tests/twisted/run-test.sh.in | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 751e7c4..458183a 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -273,8 +273,8 @@ check-twisted: $(BUILT_SOURCES)
 	failed=0; \
 	CHECK_TWISTED_UNINSTALLED=1 \
 	  CHECK_TWISTED_SLOW=$(CHECK_TWISTED_SLOW) \
-	  MC_ABS_TOP_SRCDIR=@abs_top_srcdir@ \
-	  MC_ABS_TOP_BUILDDIR=@abs_top_builddir@ \
+	  CHECK_TWISTED_ABS_TOP_SRCDIR=@abs_top_srcdir@ \
+	  CHECK_TWISTED_ABS_TOP_BUILDDIR=@abs_top_builddir@ \
 	  sh run-test.sh "${TWISTED_TESTS}${extra_tests}"
 	if test -e core; then\
 		echo "Core dump exists: core";\
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index 05d6d64..fa3b985 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -34,17 +34,17 @@ if test "x$CHECK_TWISTED_UNINSTALLED" = x; then
   CHECK_TWISTED_PATH="@mctestsdir@/twisted"
   export CHECK_TWISTED_PATH
 else
-  if test -z "$MC_ABS_TOP_SRCDIR"; then
-    echo "Bail out! MC_ABS_TOP_SRCDIR must be set"
+  if test -z "$CHECK_TWISTED_ABS_TOP_SRCDIR"; then
+    echo "Bail out! CHECK_TWISTED_ABS_TOP_SRCDIR must be set"
     exit 1
   fi
-  if test -z "$MC_ABS_TOP_BUILDDIR"; then
-    echo "Bail out! MC_ABS_TOP_BUILDDIR must be set"
+  if test -z "$CHECK_TWISTED_ABS_TOP_BUILDDIR"; then
+    echo "Bail out! CHECK_TWISTED_ABS_TOP_BUILDDIR must be set"
     exit 1
   fi
 
-  test_src="${MC_ABS_TOP_SRCDIR}/tests"
-  test_build="${MC_ABS_TOP_BUILDDIR}/tests"
+  test_src="${CHECK_TWISTED_ABS_TOP_SRCDIR}/tests"
+  test_build="${CHECK_TWISTED_ABS_TOP_BUILDDIR}/tests"
   config_file="${test_build}/twisted/tools/servicedir-uninstalled/tmp-session-bus.conf"
   plugins="${test_build}/twisted/.libs"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git