From 3c031ef5aa1f7f53c6344781cb38b78abe44dc96 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 25 Jul 2017 12:43:01 +0100 Subject: 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. Reviewed-by: Philip Withnall [smcv: Rebase onto 1.13.x branch, fix minor conflicts] Signed-off-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354 --- tools/ci-build.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tools') diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 71529662..d0938ee2 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 ;; @@ -178,6 +186,8 @@ case "$ci_buildsys" in # Re-enable the deprecated pam_console support to make # sure it still builds set "$@" --with-console-auth-dir=/var/run/console + # Leave stats, user-session, etc. at default settings + # to check that the defaults can compile on an old OS shift ;; -- cgit v1.2.1