[telepathy-mission-control-5.16] telepathy-mission-control: run-test.sh.in: now that we run under 'set -e', catch failures

Simon McVittie smcv at kemper.freedesktop.org
Fri Sep 20 04:51:57 PDT 2013


Module: telepathy-mission-control
Branch: telepathy-mission-control-5.16
Commit: 83d08c87a251824f6f5f52037e1f79587bc9446c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=83d08c87a251824f6f5f52037e1f79587bc9446c

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Sep 19 19:43:29 2013 +0100

run-test.sh.in: now that we run under 'set -e', catch failures

If we just let with-session-bus.sh exit nonzero, the script aborts.
We want to catch the nonzero exit status and do some more things
before failing.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69585
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

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

diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in
index 2cb87b3..ac553e3 100644
--- a/tests/twisted/run-test.sh.in
+++ b/tests/twisted/run-test.sh.in
@@ -111,13 +111,13 @@ for i in $list ; do
   AG_SERVICES="${tmp}/libaccounts-services"
   export AG_SERVICES
 
+  e=0
   sh "${test_src}/twisted/tools/with-session-bus.sh" \
     ${MC_TEST_SLEEP} \
     --also-for-system \
     --config-file="${config_file}" \
     -- \
-    @TEST_PYTHON@ -u "${test_src}/twisted/$i"
-  e=$?
+    @TEST_PYTHON@ -u "${test_src}/twisted/$i" || e=$?
   case "$e" in
     (0)
       echo "PASS: $i"



More information about the telepathy-commits mailing list