From: Simon McVittie <smcv@collabora.com>
Date: Tue, 25 Jul 2017 11:43:40 +0000 (+0100)
Subject: travis-ci: Do at least one build with and one without containers
X-Git-Tag: dbus-1.13.0~57^2~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=333558d67ede6bcf6b8281cb3dcdde336e715450;p=thirdparty%2Fdbus.git

travis-ci: Do at least one build with and one without containers

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
---

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index d0938ee22..33d5ffe1d 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -127,6 +127,7 @@ case "$ci_buildsys" in
                 set "$@" --enable-developer --enable-tests
                 # Enable optional features that are off by default
                 if [ "$ci_host" != mingw ]; then
+                    set "$@" --enable-containers
                     set "$@" --enable-user-session
                 fi
                 shift
@@ -153,6 +154,7 @@ case "$ci_buildsys" in
                 set "$@" --disable-libaudit --without-valgrind
                 # Disable optional features, some of which are on by
                 # default
+                set "$@" --disable-containers
                 set "$@" --disable-stats
                 set "$@" --disable-user-session
                 shift