From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sat, 7 Jan 2023 09:27:05 +0000 (+0100)
Subject: oss-fuzz: include generated corpora in the final zip file
X-Git-Tag: v253-rc1~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bef8d18b3f9776fdb28fc9a4820f9ce9418422f9;p=thirdparty%2Fsystemd.git

oss-fuzz: include generated corpora in the final zip file

Since the files with generated directives are now automatically
generated during build, they're now under the respective build directory
which the current oss-fuzz CI script didn't account for.

Follow-up to: #24958
Resolves: #25859
---

diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh
index 793411ed845..7e9312b8334 100755
--- a/tools/oss-fuzz.sh
+++ b/tools/oss-fuzz.sh
@@ -97,7 +97,10 @@ rm -rf "$hosts"
 # The seed corpus is a separate flat archive for each fuzzer,
 # with a fixed name ${fuzzer}_seed_corpus.zip.
 for d in test/fuzz/fuzz-*; do
-    zip -jqr "$OUT/$(basename "$d")_seed_corpus.zip" "$d"
+    fuzzer="$(basename "$d")"
+    # Include the build-generated corpora if any as well
+    readarray -t generated < <(find "$build/test/fuzz" -maxdepth 1 -name "${fuzzer}*" -type f)
+    zip -jqr "$OUT/${fuzzer}_seed_corpus.zip" "$d" "${generated[@]}"
 done
 
 # get fuzz-dns-packet corpus