Attachment 86158 Details for Bug 69585 – 1/5] run-test.sh.in: now that we run under 'set -e', catch failures

[patch] 1/5] run-test.sh.in: now that we run under 'set -e', catch failures

0001-run-test.sh.in-now-that-we-run-under-set-e-catch-fai.patch (text/plain), 1.08 KB, created by Simon McVittie on 2013-09-19 18:45:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-19 18:45:37 UTC

Size: 1.08 KB

patch

obsolete

>From e870aefe1c4a3e43603dc83a52d21720a80f2c9d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 19 Sep 2013 19:43:29 +0100
>Subject: [PATCH 1/5] 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.
>---
> 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 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"
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 69585: 86158 | 86159 | 86160 | 86161 | 86162 | 86176

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.