From 96e7472dcd3dbcb347591f92d9610031bd179d92 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 11 Apr 2025 11:41:48 +0200 Subject: [PATCH 1/3] meson: Fix installation directory for integration-tests when using rsync --- test/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/meson.build b/test/meson.build index 423fec7d898..e3f78b30046 100644 --- a/test/meson.build +++ b/test/meson.build @@ -296,7 +296,7 @@ if install_tests follow_symlinks : false) 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 From fc4f9c5f8b95f00c04b2d1f7827d0ecefade9458 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 11 Apr 2025 12:12:12 +0200 Subject: [PATCH 2/3] test: Work around bug in meson when installing directory symlinks Installing symlinks pointing to directories with install_subdir() is broken (see https://github.com/mesonbuild/meson/pull/14471). Let's work around the issue for now by manually installing the standalone directory until the issue is fixed upstream and available in meson in all supported distributions. --- test/meson.build | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/meson.build b/test/meson.build index e3f78b30046..9149ca1e1e8 100644 --- a/test/meson.build +++ b/test/meson.build @@ -291,9 +291,20 @@ 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', testsdir)) From 8318cac68bc4f5be985296268812c5a183822a1a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 9 Apr 2025 14:30:13 +0200 Subject: [PATCH 3/3] mkosi: update fedora commit reference to 6646d13acae64665f63354cd60ecf963ee563b96 * 6646d13aca fmf: Run tests from systemd-tests rpm if possible --- .packit.yml | 2 +- mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.packit.yml b/.packit.yml index acede2ad4c9..723df85a53d 100644 --- a/.packit.yml +++ b/.packit.yml @@ -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 diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf index 22ab093fcf1..7cdcfb72eba 100644 --- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf +++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf @@ -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