Attachment 128247 Details for Bug 98889 – travis-ci: consistently use yes/no instead of yes/empty

[patch] travis-ci: consistently use yes/no instead of yes/empty

0008-travis-ci-consistently-use-yes-no-instead-of-yes-emp.patch (text/plain), 3.06 KB, created by Simon McVittie on 2016-11-28 17:59:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-11-28 17:59:39 UTC

Size: 3.06 KB

patch

obsolete

>From de51f0ff3dfd1fa4c9463c3866e3980fbafbb369 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 28 Nov 2016 12:58:53 +0000
>Subject: [PATCH 08/12] travis-ci: consistently use yes/no instead of yes/empty
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> tools/ci-build.sh | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/tools/ci-build.sh b/tools/ci-build.sh
>index 5fa1386..7b3b55f 100755
>--- a/tools/ci-build.sh
>+++ b/tools/ci-build.sh
>@@ -152,9 +152,9 @@ case "$ci_buildsys" in
>                 set "$@" CXXFLAGS=-static-libgcc
>                 # don't run tests yet, Wine needs Xvfb and
>                 # more msys2 libraries
>-                ci_test=
>+                ci_test=no
>                 # don't "make install" system-wide
>-                ci_sudo=
>+                ci_sudo=no
>                 shift
>                 ;;
>         esac
>@@ -167,30 +167,30 @@ case "$ci_buildsys" in
>             "$@"
> 
>         ${make}
>-        [ -z "$ci_test" ] || ${make} check || [ -z "$ci_test_fatal" ]
>+        [ "$ci_test" = no ] || ${make} check || [ "$ci_test_fatal" = no ]
>         cat test/test-suite.log || :
>-        [ -z "$ci_test" ] || ${make} distcheck || \
>-            [ -z "$ci_test_fatal" ]
>+        [ "$ci_test" = no ] || ${make} distcheck || \
>+            [ "$ci_test_fatal" = no ]
> 
>         ${make} install DESTDIR=$(pwd)/DESTDIR
>         ( cd DESTDIR && find . )
> 
>-        if [ -n "$ci_sudo" ] && [ -n "$ci_test" ]; then
>+        if [ "$ci_sudo" = yes ] && [ "$ci_test" = yes ]; then
>             sudo ${make} install
>             LD_LIBRARY_PATH=/usr/local/lib ${make} installcheck || \
>-                [ -z "$ci_test_fatal" ]
>+                [ "$ci_test_fatal" = no ]
>             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/ || \
>-                [ -z "$ci_test_fatal" ]
>+                [ "$ci_test_fatal" = no ]
> 
>             # 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 || \
>-                [ -z "$ci_test_fatal" ]
>+                [ "$ci_test_fatal" = no ]
>         fi
>         ;;
> 
>@@ -209,7 +209,7 @@ case "$ci_buildsys" in
>                 shift
>                 # don't run tests yet, Wine needs Xvfb and more
>                 # msys2 libraries
>-                ci_test=
>+                ci_test=no
>                 ;;
>         esac
> 
>@@ -219,7 +219,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
>-        [ -z "$ci_test" ] || ctest -VV || [ -z "$ci_test_fatal" ]
>+        [ "$ci_test" = no ] || ctest -VV || [ "$ci_test_fatal" = no ]
>         ${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.