mkosi: update fedora commit reference to 6646d13acae64665f63354cd60ecf963ee563b96 (#37065)

* 6646d13aca fmf: Run tests from systemd-tests rpm if possible
This commit is contained in:
Daan De Meyer
2025-04-11 13:46:20 +02:00
committed by GitHub
3 changed files with 14 additions and 3 deletions

View File

@@ -39,7 +39,7 @@ jobs:
trigger: pull_request
fmf_url: https://src.fedoraproject.org/rpms/systemd
# This is automatically updated by tools/fetch-distro.py --update fedora
fmf_ref: 08ce156d74460867657fb9b201c8be93d31e07de
fmf_ref: 6646d13acae64665f63354cd60ecf963ee563b96
targets:
- fedora-rawhide-x86_64
# testing-farm in the Fedora repository is explicitly configured to use testing-farm bare metal runners as

View File

@@ -8,5 +8,5 @@ Distribution=|fedora
Environment=
GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
GIT_BRANCH=rawhide
GIT_COMMIT=08ce156d74460867657fb9b201c8be93d31e07de
GIT_COMMIT=6646d13acae64665f63354cd60ecf963ee563b96
PKG_SUBDIR=fedora

View File

@@ -291,12 +291,23 @@ if install_tests
endif
if meson.version().version_compare('>=1.3.0')
# Installing symlinks to directories is broken in install_subdir() so we exclude the
# standalone directory from install_subdir() and handle it manually.
# TODO: Remove when https://github.com/mesonbuild/meson/pull/14471 is available in all
# supported distributions.
install_subdir('integration-tests',
install_dir : testsdir,
exclude_directories : ['standalone'],
follow_symlinks : false)
install_emptydir(testsdir / 'integration-tests/standalone')
install_data('integration-tests/standalone/meson.build',
install_dir : testsdir / 'integration-tests/standalone')
install_symlink('integration-tests',
pointing_to : '..',
install_dir : testsdir / 'integration-tests/standalone')
else
meson.add_install_script(sh, '-c',
rsync_r.format(meson.current_source_dir() / 'integration-tests', testdata_dir))
rsync_r.format(meson.current_source_dir() / 'integration-tests', testsdir))
endif
foreach integration_test : integration_tests