diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-26 11:59:22 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 09:20:50 +0000 |
| commit | 00ca212d08b4ceebf83449692e1cfd0e28cec360 (patch) | |
| tree | c7db81a31f566e91198d4066e6948448f3fdfcc3 | |
| parent | e4cccbc89babf84714b80075f1111c7a5b7a260a (diff) | |
Replace MC_TEST_LOG_DIR with CHECK_TWISTED_LOG_DIR
| -rw-r--r-- | tests/twisted/run-test.sh.in | 4 | ||||
| -rw-r--r-- | tests/twisted/tools/exec-with-log.sh.in | 8 | ||||
| -rwxr-xr-x | 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 b4d02197..533846cb 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 e9b1e3c1..2e3ec8c5 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 aab8e974..83e686c2 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 |