From: Jan Janssen <medhefgo@web.de>
Date: Fri, 27 Jan 2023 12:22:36 +0000 (+0100)
Subject: meson: Add simple_fuzzers list
X-Git-Tag: v254-rc1~1200^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9a7153cd24666edb67a4917b9a95fa41cd1929c;p=thirdparty%2Fsystemd.git

meson: Add simple_fuzzers list
---

diff --git a/meson.build b/meson.build
index d8ab43ba6cf..32fc9e966d6 100644
--- a/meson.build
+++ b/meson.build
@@ -1938,6 +1938,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests)
 tests = []
 simple_tests = []
 fuzzers = []
+simple_fuzzers = []
 catalogs = []
 
 ############################################################
@@ -4179,6 +4180,10 @@ endif
 
 ############################################################
 
+foreach fuzzer : simple_fuzzers
+        fuzzers += [ [[fuzzer]] ]
+endforeach
+
 fuzzer_exes = []
 
 foreach tuple : fuzzers
diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build
index 6f36536f1b5..02a722edb1e 100644
--- a/src/fuzz/meson.build
+++ b/src/fuzz/meson.build
@@ -1,25 +1,15 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-fuzzers += [
-        [files('fuzz-bootspec.c')],
-
-        [files('fuzz-bus-label.c')],
-
-        [files('fuzz-calendarspec.c')],
-
-        [files('fuzz-catalog.c')],
-
-        [files('fuzz-compress.c')],
-
-        [files('fuzz-env-file.c')],
-
-        [files('fuzz-hostname-setup.c')],
-
-        [files('fuzz-json.c')],
-
-        [files('fuzz-time-util.c')],
-
-        [files('fuzz-udev-database.c')],
-
-        [files('fuzz-varlink.c')],
-]
+simple_fuzzers += files(
+        'fuzz-bootspec.c',
+        'fuzz-bus-label.c',
+        'fuzz-calendarspec.c',
+        'fuzz-catalog.c',
+        'fuzz-compress.c',
+        'fuzz-env-file.c',
+        'fuzz-hostname-setup.c',
+        'fuzz-json.c',
+        'fuzz-time-util.c',
+        'fuzz-udev-database.c',
+        'fuzz-varlink.c',
+)
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 3478d9e5a05..23fa7c20cae 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -241,8 +241,7 @@ endif
 
 ############################################################
 
-fuzzers += [
-        [files('sd-bus/fuzz-bus-message.c')],
-
-        [files('sd-bus/fuzz-bus-match.c')],
-]
+simple_fuzzers += files(
+        'sd-bus/fuzz-bus-match.c',
+        'sd-bus/fuzz-bus-message.c',
+)
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 9d647dd6056..ab0489c6dde 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -160,6 +160,10 @@ if install_sysconfdir
                                  mkdir_p.format(sysconfdir / 'udev/rules.d'))
 endif
 
+simple_fuzzers += files(
+        'fuzz-udev-rule-parse-value.c',
+)
+
 fuzzers += [
         [files('net/fuzz-link-parser.c'),
          [libudevd_core,
@@ -174,8 +178,6 @@ fuzzers += [
          [threads,
           libacl]],
 
-        [files('fuzz-udev-rule-parse-value.c')],
-
         [files('fido_id/fuzz-fido-id-desc.c',
                'fido_id/fido_id_desc.c')],
 ]