Commit 3c031ef5 authored by Simon McVittie's avatar Simon McVittie

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's avatarPhilip Withnall <withnall@endlessm.com>
[smcv: Rebase onto 1.13.x branch, fix minor conflicts]
Signed-off-by: Simon McVittie's avatarSimon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
parent f7875ebf
......@@ -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
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment