diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-02-22 10:27:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-22 10:27:16 +0900 |
| commit | 4788f635e37625efc0d7713c3a58b3af7a1a3711 (patch) | |
| tree | 4225049cb2c44f5dce3f6dab2f2ec9f8890e9c11 /src/journal | |
| parent | b5eba967a9c5bb169d2e3183caaef6f4fe1bbab9 (diff) | |
| parent | 2ed35b2f3e183ad6455142bbca455167e3b08f39 (diff) | |
| download | systemd-4788f635e37625efc0d7713c3a58b3af7a1a3711.tar.gz | |
Merge pull request #26203 from medhefgo/meson
meson: Use dicts for test/fuzzer definitions
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/meson.build | 159 |
1 files changed, 90 insertions, 69 deletions
diff --git a/src/journal/meson.build b/src/journal/meson.build index 30cebe4d44..c9ff54c991 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -65,77 +65,98 @@ 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]], - - [files('test-journal-stream.c'), - [libjournal_core, - libshared]], +test_journal_base = { + 'link_with' : [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 += [ - [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]], +fuzzer_journald_base = { + 'link_with' : [libjournal_core, libshared], + 'dependencies' : [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]], - - [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, + }, ] |