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/resolve | |
| 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/resolve')
| -rw-r--r-- | src/resolve/meson.build | 129 |
1 files changed, 67 insertions, 62 deletions
diff --git a/src/resolve/meson.build b/src/resolve/meson.build index 331c925814..8166118c74 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -137,72 +137,77 @@ custom_target( ############################################################ +test_resolve_base = { + 'link_with' : [libsystemd_resolve_core, libshared], + 'dependencies' : [lib_openssl_or_gcrypt, libm], +} + tests += [ - [files('test-resolve-tables.c'), - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, - libm]], - - [files('test-dns-packet.c'), - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, - libm]], - - [files('test-resolved-etc-hosts.c', - 'resolved-etc-hosts.c'), - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, - libm]], - - [files('test-resolved-packet.c'), - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, - libm]], - - [files('test-resolved-stream.c') - + basic_dns_sources + systemd_resolved_sources, - [libshared], - [lib_openssl_or_gcrypt, - libm] - + systemd_resolved_dependencies, - resolve_includes], - - [files('test-dnssec.c'), - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, - libm], - [], 'HAVE_OPENSSL_OR_GCRYPT'], - - [files('test-dnssec-complex.c'), - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, - libm], - [], '', 'manual'], + { + 'sources' : files('test-resolve-tables.c'), + 'base' : test_resolve_base, + }, + { + 'sources' : files('test-dns-packet.c'), + 'base' : test_resolve_base, + }, + { + 'sources' : files( + 'test-resolved-etc-hosts.c', + 'resolved-etc-hosts.c', + ), + 'base' : test_resolve_base, + }, + { + 'sources' : files('test-resolved-packet.c'), + 'base' : test_resolve_base, + }, + { + 'sources' : files('test-dnssec.c'), + 'base' : test_resolve_base, + 'condition' : 'HAVE_OPENSSL_OR_GCRYPT', + }, + { + 'sources' : files('test-dnssec-complex.c'), + 'base' : test_resolve_base, + 'type' : 'manual', + }, + { + 'sources' : [ + files('test-resolved-stream.c'), + basic_dns_sources, + systemd_resolved_sources, + ], + 'dependencies' : [ + lib_openssl_or_gcrypt, + libm, + systemd_resolved_dependencies, + ], + 'includes' : resolve_includes, + }, ] +fuzzer_resolve_base = { + 'link_with' : [libsystemd_resolve_core, libshared], + 'dependencies' : [lib_openssl_or_gcrypt, libm], +} + fuzzers += [ - [files('fuzz-dns-packet.c'), - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, - libm]], - [files('fuzz-etc-hosts.c', - 'resolved-etc-hosts.c'), - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, - libm]], - [files('fuzz-resource-record.c'), - [libsystemd_resolve_core, - libshared], - [lib_openssl_or_gcrypt, - libm]], + { + 'sources' : files('fuzz-dns-packet.c'), + 'base' : fuzzer_resolve_base, + }, + { + 'sources' : files( + 'fuzz-etc-hosts.c', + 'resolved-etc-hosts.c', + ), + 'base' : fuzzer_resolve_base, + }, + { + 'sources' : files('fuzz-resource-record.c'), + 'base' : fuzzer_resolve_base, + }, ] systemd_resolved_sources += files('resolved.c') |