From 2c884a5e5f18bcbc17b5d1a33d364f8dd9e063ef Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 20 Oct 2023 16:32:02 +0100 Subject: [PATCH] CI: Enable Containers1 in debug builds, explicitly disable in reduced build This ensures that both "enabled" and "disabled" are tested, regardless of whether it is enabled by default (currently it is not). Create /var/local/run/dbus/containers so that we can run the tests. Signed-off-by: Simon McVittie --- tools/ci-build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/ci-build.sh b/tools/ci-build.sh index c971415c..b0cdade7 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -369,6 +369,7 @@ case "$ci_buildsys" in fi set -- -Db_pie=true "$@" + set -- -Dcontainers=true "$@" set -- -Duser_session=true "$@" ;; esac @@ -393,6 +394,7 @@ case "$ci_buildsys" in set "$@" -Dlibaudit=disabled -Dvalgrind=disabled # Disable optional features, some of which are on by # default + set "$@" -Dcontainers=false set "$@" -Dstats=false set "$@" -Duser_session=false shift @@ -454,6 +456,12 @@ case "$ci_buildsys" in $meson_setup "$@" "$srcdir" meson compile -v + if [ "$(id -u)" = 0 ]; then + # In production, this would be /run/dbus/containers and would + # have been set up by the init script or tmpfiles.d + mkdir -p /var/local/run/dbus/containers + fi + # This is too slow and verbose to keep enabled at the moment export DBUS_TEST_MALLOC_FAILURES=0