shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-25 21:57:32 +03:00
Code

meson: Use rsync to copy test data directories

Browse Source 
install_subdir() does not copy symlinks but copies the file they
point to. We also get a very ugly warning in the meson install
output:

"""
Warning: trying to copy a symlink that points to a file. This will copy the file,
but this will be changed in a future version of Meson to copy the symlink as is. Please update your
build definitions so that it will not break when the change happens.
"""

Let's fix both problems at once by using rsync which does the right
thing. Verified by running systemd-dissect --mtree on both the install
output before and after and all the symlinks are now correctly preserved.
This commit is contained in:
Daan De Meyer 2023-08-16 21:22:57 +02:00
parent 45b1c015b0
commit cc2a0d85d2
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/meson.build
View File

@ -23,9 +23,18 @@ if install_tests
'testsuite-63.units',
'testsuite-80.units',
]
install_subdir(subdir,
exclude_files : '.gitattributes',
install_dir : testdata_dir)
# install_subdir() does not handle symlinks correctly which causes a very ugly warning when
# installing, so if rsync is available we use that instead. See
# https://github.com/mesonbuild/meson/issues/9233.
if rsync.found()
rsync_r = rsync.full_path() + ' -rlpt --exclude .gitattributes -- "@0@" "${DESTDIR:-}@1@"'
meson.add_install_script(sh, '-c',
rsync_r.format(meson.current_source_dir() / subdir, testdata_dir))
else
install_subdir(subdir,
exclude_files : '.gitattributes',
install_dir : testdata_dir)
endif
endforeach
install_data(kbd_model_map,