summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/ci-build.sh10
1 files changed, 10 insertions, 0 deletions
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
;;