From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Wed, 20 May 2020 09:33:12 +0000 (+0200)
Subject: build-system: build the fuzz targets with both ASan and UBSan
X-Git-Tag: v246-rc1~316^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8976715804dcbd91c399644d0bf02aba482cb1b3;p=thirdparty%2Fsystemd.git

build-system: build the fuzz targets with both ASan and UBSan

Just a follow-up to https://github.com/systemd/systemd/pull/15860
---

diff --git a/meson.build b/meson.build
index f485616d10d..20cb2b88a21 100644
--- a/meson.build
+++ b/meson.build
@@ -3368,6 +3368,8 @@ foreach tuple : sanitizers
                         if want_tests != 'false' and slow_tests
                                 test('@0@:@1@:@2@'.format(b, c, sanitizer),
                                      env,
+                                     env : ['UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1'],
+                                     timeout : 60,
                                      args : [exe.full_path(),
                                              join_paths(project_source_root, p)])
                         endif
diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build
index c514f57fe3d..7d61e270fd9 100644
--- a/test/fuzz/meson.build
+++ b/test/fuzz/meson.build
@@ -1,17 +1,17 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
-sanitize_address = custom_target(
-        'sanitize-address-fuzzers',
-        output : 'sanitize-address-fuzzers',
+sanitize_address_undefined = custom_target(
+        'sanitize-address-undefined-fuzzers',
+        output : 'sanitize-address-undefined-fuzzers',
         command : [meson_build_sh,
                    project_source_root,
                    '@OUTPUT@',
                    'fuzzers',
-                   '-Db_lundef=false -Db_sanitize=address',
+                   '-Db_lundef=false -Db_sanitize=address,undefined',
                    ' '.join(cc.cmd_array()),
                    cxx_cmd])
 
-sanitizers = [['address', sanitize_address]]
+sanitizers = [['address,undefined', sanitize_address_undefined]]
 
 if git.found()
         out = run_command(