fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-07 19:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CI: Enable Containers1 in debug builds, explicitly disable in reduced build

Browse source 
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 <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2023-10-20 16:32:02 +01:00
parent 0196ed3543
commit 2c884a5e5f
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/ci-build.sh
View file

@ -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