[next] telepathy-rakia: Use common logic to compute config_file

Simon McVittie smcv at kemper.freedesktop.org
Wed May 7 03:36:31 PDT 2014


Module: telepathy-rakia
Branch: next
Commit: af08d5998e69db863c010fcbf634dff8dcd28723
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=af08d5998e69db863c010fcbf634dff8dcd28723

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May  7 11:15:09 2014 +0100

Use common logic to compute config_file

---

 tests/twisted/run-test.sh.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index 731e2e1..ca99604 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -11,7 +11,6 @@ if test "x$CHECK_TWISTED_UNINSTALLED" = x; then
   export G_TEST_SRCDIR
   G_TEST_BUILDDIR="@rakiatestsdir@/twisted"
   export G_TEST_BUILDDIR
-  config_file="${G_TEST_SRCDIR}/tools/tmp-session-bus.conf"
 
   PYTHONPATH="${G_TEST_SRCDIR}"
   export PYTHONPATH
@@ -29,12 +28,13 @@ else
   export G_TEST_SRCDIR
   G_TEST_BUILDDIR="${RAKIA_ABS_TOP_BUILDDIR}/tests/twisted"
   export G_TEST_BUILDDIR
-  config_file="${G_TEST_BUILDDIR}/tools/tmp-session-bus.conf"
 
   PYTHONPATH="${G_TEST_SRCDIR}:${G_TEST_BUILDDIR}"
   export PYTHONPATH
 fi
 
+config_file="${G_TEST_BUILDDIR}/tools/tmp-session-bus.conf"
+
 if [ -n "$1" ] ; then
   list="$1"
 else



More information about the telepathy-commits mailing list