rpms/systemd
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fmf: Run tests from systemd-tests rpm if possible

Browse source 
Running from the source tarball implies running with unpatched tests,
whereas the same files from the systemd-tests package (which now contains
the mkosi and integration test files) will be patched.

[skip changelog]
This commit is contained in:
Daan De Meyer 2025-04-08 22:02:11 +02:00
commit 6646d13aca
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plans/run-integration-tests.sh
View file

@ -32,18 +32,28 @@ fi
PACKAGEDIR="$PWD"
mkdir systemd
rpm2cpio ./systemd-*.src.rpm | cpio --to-stdout --extract './*.tar.gz' | tar xz --strip-components=1 -C systemd
# TODO: Remove fallback once v257.6 is released. Also stop downloading source rpms then.
# This will match both the regular and the debuginfo rpm so make sure we select only the
# non-debuginfo rpm.
RPMS=(systemd-tests-*.rpm)
rpm2cpio "${RPMS[0]}" | cpio --make-directories --extract
if [[ -d usr/lib/systemd/tests/mkosi ]]; then
pushd usr/lib/systemd/tests
mkosi_hash="$(grep "MinimumVersion=commit:" mkosi/mkosi.conf | sed "s|MinimumVersion=commit:||g")"
else
mkdir systemd
rpm2cpio systemd-*.src.rpm | cpio --to-stdout --extract './*.tar.gz' | tar xz --strip-components=1 -C systemd
pushd systemd
mkosi_hash="$(grep systemd/mkosi@ .github/workflows/mkosi.yml | sed "s|.*systemd/mkosi@||g")"
fi
# Now prepare mkosi at the same version required by the systemd repo.
git clone https://github.com/systemd/mkosi /var/tmp/systemd-integration-tests-mkosi
mkosi_hash="$(grep systemd/mkosi@ systemd/.github/workflows/mkosi.yml | sed "s|.*systemd/mkosi@||g")"
git -C /var/tmp/systemd-integration-tests-mkosi checkout "$mkosi_hash"
export PATH="/var/tmp/systemd-integration-tests-mkosi/bin:$PATH"
pushd systemd
# shellcheck source=/dev/null
. /etc/os-release || . /usr/lib/os-release
@ -119,7 +129,9 @@ export TEST_SKIP="TEST-21-DFUZZER"
mkosi genkey
mkosi summary
mkosi -f sandbox -- true
if [[ -d test/integration-tests/standalone ]]; then
if [[ -d integration-tests/standalone ]]; then
mkosi sandbox -- meson setup build integration-tests/standalone
elif [[ -d test/integration-tests/standalone ]]; then
mkosi sandbox -- meson setup build test/integration-tests/standalone
else
mkosi sandbox -- meson setup -Dintegration-tests=true build