Attachment 128249 Details for Bug 98889 – travis-ci: introduce maybe_fail_tests() to make test failure more obvious

[patch] travis-ci: introduce maybe_fail_tests() to make test failure more obvious

0010-travis-ci-introduce-maybe_fail_tests-to-make-test-fa.patch (text/plain), 2.63 KB, created by Simon McVittie on 2016-11-28 18:00:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-11-28 18:00:26 UTC

Size: 2.63 KB

patch

obsolete

>From 17b9b62f0cc9c157bccd64a7415a4388ef75eccf Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 28 Nov 2016 13:04:13 +0000
>Subject: [PATCH 10/12] travis-ci: introduce maybe_fail_tests() to make test
> failure more obvious
>
>Taken from the version I added to OSTree.
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> tools/ci-build.sh | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
>diff --git a/tools/ci-build.sh b/tools/ci-build.sh
>index d85b28f..c3b4f49 100755
>--- a/tools/ci-build.sh
>+++ b/tools/ci-build.sh
>@@ -34,6 +34,12 @@ NULL=
> : "${ci_test_fatal:=yes}"
> : "${ci_variant:=production}"
> 
>+maybe_fail_tests () {
>+    if [ "$ci_test_fatal" = yes ]; then
>+        exit 1
>+    fi
>+}
>+
> NOCONFIGURE=1 ./autogen.sh
> 
> srcdir="$(pwd)"
>@@ -157,10 +163,9 @@ case "$ci_buildsys" in
>             "$@"
> 
>         ${make}
>-        [ "$ci_test" = no ] || ${make} check || [ "$ci_test_fatal" = no ]
>+        [ "$ci_test" = no ] || ${make} check || maybe_fail_tests
>         cat test/test-suite.log || :
>-        [ "$ci_test" = no ] || ${make} distcheck || \
>-            [ "$ci_test_fatal" = no ]
>+        [ "$ci_test" = no ] || ${make} distcheck || maybe_fail_tests
> 
>         ${make} install DESTDIR=$(pwd)/DESTDIR
>         ( cd DESTDIR && find . )
>@@ -168,19 +173,19 @@ case "$ci_buildsys" in
>         if [ "$ci_sudo" = yes ] && [ "$ci_test" = yes ]; then
>             sudo ${make} install
>             LD_LIBRARY_PATH=/usr/local/lib ${make} installcheck || \
>-                [ "$ci_test_fatal" = no ]
>+                maybe_fail_tests
>             cat test/test-suite.log || :
> 
>             # re-run them with gnome-desktop-testing
>             env LD_LIBRARY_PATH=/usr/local/lib \
>             gnome-desktop-testing-runner -d /usr/local/share dbus/ || \
>-                [ "$ci_test_fatal" = no ]
>+                maybe_fail_tests
> 
>             # these tests benefit from being re-run as root
>             sudo env LD_LIBRARY_PATH=/usr/local/lib \
>             gnome-desktop-testing-runner -d /usr/local/share \
>                 dbus/test-uid-permissions_with_config.test || \
>-                [ "$ci_test_fatal" = no ]
>+                maybe_fail_tests
>         fi
>         ;;
> 
>@@ -209,7 +214,7 @@ case "$ci_buildsys" in
>         # The test coverage for OOM-safety is too verbose to be useful on
>         # travis-ci.
>         export DBUS_TEST_MALLOC_FAILURES=0
>-        [ "$ci_test" = no ] || ctest -VV || [ "$ci_test_fatal" = no ]
>+        [ "$ci_test" = no ] || ctest -VV || maybe_fail_tests
>         ${make} install DESTDIR=$(pwd)/DESTDIR
>         ( cd DESTDIR && find . )
>         ;;
>-- 
>2.10.2
>

Actions: View | Splinter Review

Attachments on bug 98889: 128244 | 128245 | 128246 | 128247 | 128248 | 128249 | 128250 | 128251

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.