clean up fuzzer related meson logic

This commit is contained in:
2025-12-01 19:50:26 +00:00
parent b753519a3e
commit a11e19e8e1
3 changed files with 21 additions and 18 deletions

View File

@@ -1,6 +1,7 @@
fuzzers += { fuzzers += {
'atom_parser': [ 'atom_parser': {
meson.current_source_dir() / 'gencorpus.rs', 'gencorpus': meson.current_source_dir() / 'gencorpus.rs',
meson.current_source_dir() / 'fuzz.rs', 'fuzzer': meson.current_source_dir() / 'fuzz.rs',
], 'deps': [mon],
},
} }

View File

@@ -1,6 +1,7 @@
fuzzers += { fuzzers += {
'atom_vercmp': [ 'atom_vercmp': {
meson.current_source_dir() / 'gencorpus.rs', 'gencorpus': meson.current_source_dir() / 'gencorpus.rs',
meson.current_source_dir() / 'fuzz.rs', 'fuzzer': meson.current_source_dir() / 'fuzz.rs',
], 'deps': [mon],
},
} }

View File

@@ -4,9 +4,10 @@ fuzzers = {}
subdir('atom') subdir('atom')
foreach fuzzer, sources : fuzzers foreach fuzzer, meta : fuzzers
gencorpus_rs = sources[0] gencorpus_rs = meta['gencorpus']
fuzz_rs = sources[1] fuzz_rs = meta['fuzzer']
deps = meta['deps']
gencorpus = executable( gencorpus = executable(
fuzzer + '_' + 'gencorpus', fuzzer + '_' + 'gencorpus',
@@ -18,20 +19,20 @@ foreach fuzzer, sources : fuzzers
corpus_directory = fuzzer + '_' + 'corpus' corpus_directory = fuzzer + '_' + 'corpus'
corpus = custom_target( corpus = custom_target(
fuzzer + '_' + 'corpus', f'@fuzzer@_corpus',
output: fuzzer + '_' + 'corpus', output: f'@fuzzer@_corpus',
command: [gencorpus, corpus_directory], command: [gencorpus, corpus_directory],
) )
fuzz_h = custom_target( fuzz_h = custom_target(
fuzzer + '_' + 'fuzz_h', f'@fuzzer@_fuzz.h',
input: fuzz_rs, input: fuzz_rs,
output: fuzzer + '_' + 'fuzz.h', output: f'@fuzzer@_fuzz.h',
command: [cbindgen, '@INPUT@', '-o', '@OUTPUT'], command: [cbindgen, '@INPUT@', '-o', '@OUTPUT'],
) )
fuzz_rs = static_library( fuzz_rs = static_library(
fuzzer + '.rs', f'@fuzzer@.rs',
fuzz_rs, fuzz_rs,
rust_abi: 'c', rust_abi: 'c',
rust_args: [ rust_args: [
@@ -39,12 +40,12 @@ foreach fuzzer, sources : fuzzers
'-Cllvm-args=-sanitizer-coverage-level=3', '-Cllvm-args=-sanitizer-coverage-level=3',
'-Cllvm-args=-sanitizer-coverage-inline-8bit-counters', '-Cllvm-args=-sanitizer-coverage-inline-8bit-counters',
], ],
dependencies: [mon], dependencies: deps,
link_with: [gentoo_utils], link_with: [gentoo_utils],
) )
fuzz = executable( fuzz = executable(
fuzzer + '_' + 'fuzzer', f'@fuzzer@_fuzzer',
link_args: ['-fsanitize=fuzzer'], link_args: ['-fsanitize=fuzzer'],
link_with: [fuzz_rs], link_with: [fuzz_rs],
) )