diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-02-22 10:27:16 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-22 10:27:16 +0900 |
commit | 4788f635e37625efc0d7713c3a58b3af7a1a3711 (patch) | |
tree | 4225049cb2c44f5dce3f6dab2f2ec9f8890e9c11 /src/nspawn | |
parent | b5eba967a9c5bb169d2e3183caaef6f4fe1bbab9 (diff) | |
parent | 2ed35b2f3e183ad6455142bbca455167e3b08f39 (diff) | |
download | systemd-4788f635e37625efc0d7713c3a58b3af7a1a3711.tar.gz |
Merge pull request #26203 from medhefgo/meson
meson: Use dicts for test/fuzzer definitions
Diffstat (limited to 'src/nspawn')
-rw-r--r-- | src/nspawn/meson.build | 62 |
1 files changed, 38 insertions, 24 deletions
diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build index 36f0a92686..43e3e188b2 100644 --- a/src/nspawn/meson.build +++ b/src/nspawn/meson.build @@ -39,31 +39,45 @@ systemd_nspawn_sources = files('nspawn.c') ############################################################ tests += [ - [files('test-nspawn-tables.c'), - [libnspawn_core, - libshared], - [libseccomp]], - - [files('test-nspawn-util.c'), - [libnspawn_core, - libshared], - [libseccomp]], - - [files('test-patch-uid.c'), - [libnspawn_core, - libshared], - [libacl], - [], '', 'manual'], + { + 'sources' : files('test-nspawn-tables.c'), + 'link_with' : [ + libnspawn_core, + libshared, + ], + 'dependencies' : libseccomp, + }, + { + 'sources' : files('test-nspawn-util.c'), + 'link_with' : [ + libnspawn_core, + libshared, + ], + 'dependencies' : libseccomp, + }, + { + 'sources' : files('test-patch-uid.c'), + 'link_with' : [ + libnspawn_core, + libshared, + ], + 'dependencies' : libacl, + 'type' : 'manual', + }, ] -fuzzers += [ - [files('fuzz-nspawn-settings.c'), - [libshared, - libnspawn_core], - [libseccomp]], +fuzzer_nspawn_base = { + 'link_with' : [libshared, libnspawn_core], + 'dependencies' : libseccomp +} - [files('fuzz-nspawn-oci.c'), - [libshared, - libnspawn_core], - [libseccomp]], +fuzzers += [ + { + 'sources' : files('fuzz-nspawn-settings.c'), + 'base' : fuzzer_nspawn_base, + }, + { + 'sources' : files('fuzz-nspawn-oci.c'), + 'base' : fuzzer_nspawn_base, + }, ] |