Skip to content

Commit ccd0bc4

Browse files
Make test suite work during package building
This now makes release.sh depend on cgroups v2, but this should be fine.
1 parent f4a4c8d commit ccd0bc4

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
include pyproject.toml
99
include *.md
10+
include test/*.sh
1011
recursive-include benchexec/tablegenerator/react-table/build *.min.js
1112
recursive-include benchexec/tablegenerator/react-table/build *.min.css
1213
recursive-include bin *

debian/rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export PYBUILD_NAME=benchexec
1717
# Our tests need some additional files in {build_dir} to execute succesfully
1818
export PYBUILD_BEFORE_TEST=cp -r {dir}/bin {dir}/doc {build_dir}/
1919
export PYBUILD_AFTER_TEST=rm -r {build_dir}/bin {build_dir}/doc
20+
export PYBUILD_TEST_ARGS=""
2021

2122
%:
2223
dh $@ --with python3 --buildsystem=pybuild

release.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ cd "BenchExec-$VERSION"
103103
dh_make -p "benchexec_$VERSION" --createorig -f "../$TAR" -i -c apache || true
104104

105105
dpkg-buildpackage --build=source -sa "--sign-key=$DEBKEY"
106-
podman run --rm -w "$(pwd)" -v "$TEMP_DEB:$TEMP_DEB:rw" ubuntu:20.04 bash -c '
106+
podman run --security-opt unmask=/sys/fs/cgroup --cgroups=split \
107+
--security-opt unmask=/proc/* --security-opt seccomp=unconfined --device /dev/fuse \
108+
--rm -w "$(pwd)" -v "$TEMP_DEB:$TEMP_DEB:rw" --rm ubuntu:20.04 \
109+
"$TEMP_DEB/BenchExec-$VERSION/test/setup_cgroupsv2_in_container.sh" bash -c '
107110
apt-get update
108111
apt-get install -y --no-install-recommends dpkg-dev
109112
TZ=UTC DEBIAN_FRONTEND=noninteractive apt-get install -y $(dpkg-checkbuilddeps 2>&1 | grep -o "Unmet build dependencies:.*" | cut -d: -f2- | sed "s/([^)]*)//g")

0 commit comments

Comments
 (0)