[Pkg-telepathy-commits] [telepathy-mission-control-6] 15/90: Replace MC_TEST_LOG_DIR with CHECK_TWISTED_LOG_DIR
Simon McVittie
smcv at debian.org
Wed May 14 12:09:00 UTC 2014
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 00ca212d08b4ceebf83449692e1cfd0e28cec360
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Wed Mar 26 11:59:22 2014 +0000
Replace MC_TEST_LOG_DIR with CHECK_TWISTED_LOG_DIR
---
tests/twisted/run-test.sh.in | 4 ++--
tests/twisted/tools/exec-with-log.sh.in | 8 ++++----
tests/twisted/tools/run-mc.sh.in | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index b4d0219..533846c 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -96,8 +96,8 @@ for t in $list ; do
rm -fr "$tmp"
mkdir "$tmp"
- MC_TEST_LOG_DIR="${tmp}"
- export MC_TEST_LOG_DIR
+ CHECK_TWISTED_LOG_DIR="${tmp}"
+ export CHECK_TWISTED_LOG_DIR
MC_ACCOUNT_DIR="${tmp}/mc-account-dir"
export MC_ACCOUNT_DIR
XDG_CONFIG_HOME="${tmp}/config"
diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in
index e9b1e3c..2e3ec8c 100644
--- a/tests/twisted/tools/exec-with-log.sh.in
+++ b/tests/twisted/tools/exec-with-log.sh.in
@@ -29,13 +29,13 @@ fi
cd "${CHECK_TWISTED_CURDIR}" || exit 1
-if test -z "$MC_TEST_LOG_DIR"; then
- echo "MC_TEST_LOG_DIR must be set"
+if test -z "$CHECK_TWISTED_LOG_DIR"; then
+ echo "CHECK_TWISTED_LOG_DIR must be set"
exit 1
fi
-exec > ${MC_TEST_LOG_DIR}/missioncontrol-$$.log 2>&1
-ln -f ${MC_TEST_LOG_DIR}/missioncontrol-$$.log missioncontrol.log
+exec > ${CHECK_TWISTED_LOG_DIR}/missioncontrol-$$.log 2>&1
+ln -f ${CHECK_TWISTED_LOG_DIR}/missioncontrol-$$.log missioncontrol.log
if test -n "$MISSIONCONTROL_TEST_VALGRIND"; then
G_DEBUG="$G_DEBUG,gc-friendly"
diff --git a/tests/twisted/tools/run-mc.sh.in b/tests/twisted/tools/run-mc.sh.in
index aab8e97..83e686c 100755
--- a/tests/twisted/tools/run-mc.sh.in
+++ b/tests/twisted/tools/run-mc.sh.in
@@ -5,8 +5,8 @@ export G_MESSAGES_DEBUG
ulimit -c unlimited
-if test -z "$MC_TEST_LOG_DIR"; then
- echo "MC_TEST_LOG_DIR must be set"
+if test -z "$CHECK_TWISTED_LOG_DIR"; then
+ echo "CHECK_TWISTED_LOG_DIR must be set"
exit 1
fi
@@ -16,8 +16,8 @@ if test -z "$CHECK_TWISTED_CURDIR"; then
fi
cd "${CHECK_TWISTED_CURDIR}" || exit 1
-exec > ${MC_TEST_LOG_DIR}/missioncontrol-$$.log 2>&1
-ln -f ${MC_TEST_LOG_DIR}/missioncontrol-$$.log missioncontrol.log
+exec > ${CHECK_TWISTED_LOG_DIR}/missioncontrol-$$.log 2>&1
+ln -f ${CHECK_TWISTED_LOG_DIR}/missioncontrol-$$.log missioncontrol.log
# Our fake session bus is also a fake system bus, but it doesn't know that
# when it service-activates us
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git
More information about the Pkg-telepathy-commits
mailing list