From 1763ef1d49cc1263b40f157060a61cdd6e91d3a4 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 13 Nov 2020 15:22:07 +0900
Subject: [PATCH] meson: do not build fuzzers when fuzz-tests=false

Closes #17578.
---
 meson.build           | 8 ++++----
 test/fuzz/meson.build | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index 43e328f5a6..0727fd5589 100644
--- a/meson.build
+++ b/meson.build
@@ -3438,7 +3438,7 @@ endif
 
 fuzzer_exes = []
 
-if get_option('tests') != 'false'
+if fuzz_tests or fuzzer_build
         foreach tuple : fuzzers
                 sources = tuple[0]
                 link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
@@ -3560,7 +3560,7 @@ foreach tuple : sanitizers
                         if name != prev
                                 if want_tests == 'false'
                                         message('Not compiling @0@ because tests is set to false'.format(name))
-                                elif slow_tests or fuzz_tests
+                                elif fuzz_tests
                                         exe = custom_target(
                                                 name,
                                                 output : name,
@@ -3570,12 +3570,12 @@ foreach tuple : sanitizers
                                                            '@OUTPUT@'],
                                                 build_by_default : true)
                                 else
-                                        message('Not compiling @0@ because slow-tests/fuzz-tests is set to false'.format(name))
+                                        message('Not compiling @0@ because fuzz-tests is set to false'.format(name))
                                 endif
                         endif
                         prev = name
 
-                        if want_tests != 'false' and (slow_tests or fuzz_tests)
+                        if fuzz_tests
                                 test('@0@:@1@:@2@'.format(b, c, sanitizer),
                                      env,
                                      env : ['UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1'],
diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build
index 772e07e7fc..7a83961d11 100644
--- a/test/fuzz/meson.build
+++ b/test/fuzz/meson.build
@@ -15,7 +15,7 @@ sanitize_address_undefined = custom_target(
                    project_source_root,
                    '@OUTPUT@',
                    'fuzzers',
-                   '-Db_lundef=false -Db_sanitize=address,undefined @0@'.format(optimization),
+                   '-Dfuzz-tests=true -Db_lundef=false -Db_sanitize=address,undefined @0@'.format(optimization),
                    ' '.join(cc.cmd_array()),
                    cxx_cmd])