diff options
| author | Jan Janssen <medhefgo@web.de> | 2023-08-10 18:11:25 +0200 |
|---|---|---|
| committer | Jan Janssen <medhefgo@web.de> | 2023-08-23 14:57:49 +0200 |
| commit | 7f9a0d6d74588c70af87683cd5d7c21b51c782b8 (patch) | |
| tree | d9f921d9e35ff90611fe03b2868f2026e4100c05 /test/fuzz | |
| parent | meson: Convert more options to meson features (diff) | |
| download | systemd-7f9a0d6d74588c70af87683cd5d7c21b51c782b8.tar.xz systemd-7f9a0d6d74588c70af87683cd5d7c21b51c782b8.zip | |
meson: Drop skip-deps option
Now that we use meson feature options for our dependencies, we can just
rely on '--auto-features=disabled' to do the same. One benefit of this
is that specific features can still be force-enabled by overriding it
with the appropriate '-Dfeature=enabled' flag.
The two remaining uses for skip-deps can simply rely on their default
logic that sets the value to 'no' when the dependency is disabled.
Diffstat (limited to 'test/fuzz')
| -rw-r--r-- | test/fuzz/meson.build | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build index 11b91e30bb..45f777525c 100644 --- a/test/fuzz/meson.build +++ b/test/fuzz/meson.build @@ -36,6 +36,15 @@ fuzz_regression_tests += { 'fuzz-unit-file' : dict } ############################################################ +# TODO: Use native string formatting with meson >= 1.3.0 +if get_option('auto_features').enabled() + sanitize_auto_features = 'enabled' +elif get_option('auto_features').disabled() + sanitize_auto_features = 'disabled' +else + sanitize_auto_features = 'auto' +endif + sanitize_address_undefined = custom_target( 'sanitize-address-undefined-fuzzers', output : 'sanitize-address-undefined-fuzzers', @@ -43,11 +52,11 @@ sanitize_address_undefined = custom_target( project_source_root, '@OUTPUT@', 'fuzzers', - '-Dfuzz-tests=true -Db_lundef=false -Db_sanitize=address,undefined --optimization=@0@ @1@ -Dc_args=@2@ -Dcpp_args=@2@ -Dskip-deps=@3@'.format( + '-Dfuzz-tests=true -Db_lundef=false -Db_sanitize=address,undefined --optimization=@0@ @1@ -Dc_args=@2@ -Dcpp_args=@2@ --auto-features=@3@'.format( get_option('optimization'), get_option('werror') ? '--werror' : '', '-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION', - get_option('skip-deps') + sanitize_auto_features ), ' '.join(cc.cmd_array()), cxx_cmd]) |