From 822cd3ff2579d6de8acd45d85d2b9d5f44048d5c Mon Sep 17 00:00:00 2001
From: Jan Janssen <medhefgo@web.de>
Date: Wed, 25 Jan 2023 17:19:52 +0100
Subject: meson: Use dicts for test definitions

Although this slightly more verbose it makes it much easier to reason
about. The code that produces the tests heavily benefits from this.

Test lists are also now sorted by test name.
---
 src/journal/meson.build | 77 +++++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 34 deletions(-)

(limited to 'src/journal')

diff --git a/src/journal/meson.build b/src/journal/meson.build
index 30cebe4d44..8547a90222 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -65,41 +65,50 @@ endif
 
 ############################################################
 
-tests += [
-        [files('test-journal-syslog.c'),
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4,
-          libselinux]],
-
-        [files('test-journal-config.c'),
-         [libjournal_core,
-          libshared],
-         [libxz,
-          liblz4,
-          libselinux]],
-
-        [files('test-journal.c'),
-         [libjournal_core,
-          libshared]],
+test_journal_base = {
+        'link_with' : [libjournal_core, libshared],
+}
 
-        [files('test-journal-stream.c'),
-         [libjournal_core,
-          libshared]],
-
-         [files('test-journal-flush.c'),
-          [libjournal_core,
-           libshared]],
-
-        [files('test-journal-verify.c'),
-         [libjournal_core,
-          libshared]],
-
-        [files('test-journal-interleaving.c'),
-         [libjournal_core,
-          libshared]],
+tests += [
+        {
+                'sources' : files('test-journal-config.c'),
+                'dependencies' : [
+                        liblz4,
+                        libselinux,
+                        libxz,
+                ],
+                'base' : test_journal_base,
+        },
+        {
+                'sources' : files('test-journal-flush.c'),
+                'base' : test_journal_base,
+        },
+        {
+                'sources' : files('test-journal-interleaving.c'),
+                'base' : test_journal_base,
+        },
+        {
+                'sources' : files('test-journal-stream.c'),
+                'base' : test_journal_base,
+        },
+        {
+                'sources' : files('test-journal-syslog.c'),
+                'dependencies' : [
+                        liblz4,
+                        libselinux,
+                        libxz,
+                        threads,
+                ],
+                'base' : test_journal_base,
+        },
+        {
+                'sources' : files('test-journal-verify.c'),
+                'base' : test_journal_base,
+        },
+        {
+                'sources' : files('test-journal.c'),
+                'base' : test_journal_base,
+        },
 ]
 
 fuzzers += [
-- 
cgit v1.2.1


From 2ed35b2f3e183ad6455142bbca455167e3b08f39 Mon Sep 17 00:00:00 2001
From: Jan Janssen <medhefgo@web.de>
Date: Wed, 25 Jan 2023 17:39:12 +0100
Subject: meson: Use dicts for fuzzer definitions

---
 src/journal/meson.build | 82 ++++++++++++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 35 deletions(-)

(limited to 'src/journal')

diff --git a/src/journal/meson.build b/src/journal/meson.build
index 8547a90222..c9ff54c991 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -111,40 +111,52 @@ tests += [
         },
 ]
 
-fuzzers += [
-        [files('fuzz-journald-audit.c',
-               'fuzz-journald.c'),
-         [libjournal_core,
-          libshared],
-         [libselinux]],
-
-        [files('fuzz-journald-kmsg.c',
-               'fuzz-journald.c'),
-         [libjournal_core,
-          libshared],
-         [libselinux]],
-
-        [files('fuzz-journald-native.c',
-               'fuzz-journald.c'),
-         [libjournal_core,
-          libshared],
-         [libselinux]],
-
-        [files('fuzz-journald-native-fd.c',
-               'fuzz-journald.c'),
-         [libjournal_core,
-          libshared],
-         [libselinux]],
-
-        [files('fuzz-journald-stream.c',
-               'fuzz-journald.c'),
-         [libjournal_core,
-          libshared],
-         [libselinux]],
+fuzzer_journald_base = {
+        'link_with' : [libjournal_core, libshared],
+        'dependencies' : [libselinux],
+}
 
-        [files('fuzz-journald-syslog.c',
-               'fuzz-journald.c'),
-         [libjournal_core,
-          libshared],
-         [libselinux]],
+fuzzers += [
+        {
+                'sources' : files(
+                        'fuzz-journald-audit.c',
+                        'fuzz-journald.c',
+                ),
+                'base' : fuzzer_journald_base,
+        },
+        {
+                'sources' : files(
+                        'fuzz-journald-kmsg.c',
+                        'fuzz-journald.c',
+                ),
+                'base' : fuzzer_journald_base,
+        },
+        {
+                'sources' : files(
+                        'fuzz-journald-native.c',
+                        'fuzz-journald.c',
+                ),
+                'base' : fuzzer_journald_base,
+        },
+        {
+                'sources' : files(
+                        'fuzz-journald-native-fd.c',
+                        'fuzz-journald.c',
+                ),
+                'base' : fuzzer_journald_base,
+        },
+        {
+                'sources' : files(
+                        'fuzz-journald-stream.c',
+                        'fuzz-journald.c',
+                ),
+                'base' : fuzzer_journald_base,
+        },
+        {
+                'sources' : files(
+                        'fuzz-journald-syslog.c',
+                        'fuzz-journald.c',
+                ),
+                'base' : fuzzer_journald_base,
+        },
 ]
-- 
cgit v1.2.1