From 4f7134178cded0b271b15ef5b25490a9469c77a8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 25 Jul 2017 12:43:01 +0100 Subject: [PATCH] travis-ci: Enable/disable more features in various builds In the debug build, enable features that are off by default. In the reduced build, explicitly disable features, some of which are on by default. In the legacy build, check that we can compile the default feature-set without inotify, dnotify, systemd, etc. Signed-off-by: Simon McVittie --- tools/ci-build.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/ci-build.sh b/tools/ci-build.sh index b5dcb606..ab3db419 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -125,6 +125,10 @@ case "$ci_buildsys" in # Full developer/debug build. set _ "$@" set "$@" --enable-developer --enable-tests + # Enable optional features that are off by default + if [ "$ci_host" != mingw ]; then + set "$@" --enable-user-session + fi shift # The test coverage for OOM-safety is too # verbose to be useful on travis-ci. @@ -147,6 +151,10 @@ case "$ci_buildsys" in set "$@" --disable-launchd --disable-systemd # No libaudit or valgrind set "$@" --disable-libaudit --without-valgrind + # Disable optional features, some of which are on by + # default + set "$@" --disable-stats + set "$@" --disable-user-session shift ;; @@ -175,6 +183,8 @@ case "$ci_buildsys" in set "$@" --disable-launchd --disable-systemd # No X11 autolaunching set "$@" --disable-x11-autolaunch + # Leave stats, user-session, etc. at default settings + # to check that the defaults can compile on an old OS shift ;; -- 2.13.3