dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-08 00:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Two fixes for running the integration tests standalone (#37073)

Browse Source
This commit is contained in:
Daan De Meyer
2025-04-09 21:25:40 +02:00
committed by GitHub
parent c7bb07fff5 75a5ff01d3
commit a73ce47546
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration-tests/standalone/meson.build
View File

@@ -9,7 +9,6 @@
# mkosi sandbox -- meson test -C testsuite
#
project('systemd-testsuite',
version : files('../../../meson.version'),
license : 'LGPLv2+',
default_options: ['warning_level=2'],
meson_version : '>= 0.62.0',

23
test/meson.build
View File

@@ -282,8 +282,22 @@ if want_tests != 'false'
endif
if install_tests
install_subdir('integration-tests',
install_dir : testsdir)
if meson.version().version_compare('<1.3.0')
if not rsync.found()
error('rsync is required to install the integration test data')
endif
rsync_r = rsync.full_path() + ' -rlpt --exclude .gitattributes -- "@0@" "${DESTDIR:-}@1@"'
endif
if meson.version().version_compare('>=1.3.0')
install_subdir('integration-tests',
install_dir : testsdir,
follow_symlinks : false)
else
meson.add_install_script(sh, '-c',
rsync_r.format(meson.current_source_dir() / 'integration-tests', testdata_dir))
endif
foreach integration_test : integration_tests
integration_test_unit_env = []
@@ -350,11 +364,6 @@ if install_tests
install_dir : testdata_dir,
follow_symlinks : false)
else
if not rsync.found()
error('rsync is required to install the integration test data')
endif
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))
endif