1
0
Fork 0

Merging upstream version 1.11.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 10:51:10 +01:00
parent fc25ba7fb2
commit bdf865565e
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
946 changed files with 4896 additions and 1272 deletions

View file

@ -7,6 +7,10 @@
diff = find_program('diff', required : false)
if diff.found()
srcdir = meson.current_source_dir()
builddir = meson.current_build_dir()
config_dump = executable(
'test-config-dump',
['config-dump.c'],
@ -26,11 +30,11 @@ if diff.found()
t_file,
config_diff,
args : [
meson.current_build_dir(),
config_dump.full_path(),
files('data'/t_file + '.tar.xz'),
files('data'/t_file + '.json'),
files('data'/t_file + '.out'),
builddir,
srcdir + '/data/' + t_file + '.out',
'--sysfs-tar', srcdir + '/data/' + t_file + '.tar.xz',
'--config-json', srcdir + '/data/' + t_file + '.json',
],
depends : config_dump,
)
@ -47,13 +51,38 @@ if diff.found()
'hostnqn-order',
config_diff,
args : [
meson.current_build_dir(),
test_hostnqn_order.full_path(),
files('data/hostnqn-order.tar.xz'),
files('data/hostnqn-order.json'),
files('data/hostnqn-order.out'),
builddir,
srcdir + '/data/hostnqn-order.out',
'--sysfs-tar', srcdir + '/data/hostnqn-order.tar.xz',
'--config-json', srcdir + '/data/hostnqn-order.json',
],
depends : test_hostnqn_order,
)
test_psk_json = executable(
'test-psk-json',
['psk-json.c'],
dependencies: libnvme_dep,
include_directories: [incdir],
)
config_data = [
'tls_key-1',
'tls_key-2',
]
foreach t_file : config_data
test(
'psk-json-' + t_file,
config_diff,
args : [
test_psk_json.full_path(),
builddir,
srcdir + '/data/' + t_file + '.out',
'--config-json', srcdir + '/data/' + t_file + '.json',
],
depends : test_psk_json,
)
endforeach
endif