fuzz: rename "fuzz-corpus" directory to just "fuzz"

Also, all corpus subdirectories are named exactly the same as the fuzzer they
are for. This makes the paths a bit longer, but easier.

(cherry picked from commit 93b575b26605c347a717b2aa24ddf9cad08b8080)

Resolves: #1696224

23 files changed, 4 insertions, 2 deletions

diff --git a/test/fuzz-corpus/.gitattributes b/test/fuzz/.gitattributes
index 7b1b3e1835..7b1b3e1835 100644
--- a/test/fuzz-corpus/.gitattributes
+++ b/test/fuzz/.gitattributes
diff --git a/test/fuzz-corpus/dhcp-server/discover-existing b/test/fuzz/fuzz-dhcp-server/discover-existing
index 1e26bf09e2..1e26bf09e2 100644
--- a/test/fuzz-corpus/dhcp-server/discover-existing
+++ b/test/fuzz/fuzz-dhcp-server/discover-existing
diff --git a/test/fuzz-corpus/dhcp-server/discover-new b/test/fuzz/fuzz-dhcp-server/discover-new
index feeae55e5e..feeae55e5e 100644
--- a/test/fuzz-corpus/dhcp-server/discover-new
+++ b/test/fuzz/fuzz-dhcp-server/discover-new
diff --git a/test/fuzz-corpus/dhcp-server/release b/test/fuzz/fuzz-dhcp-server/release
index 4f3eadb2f2..4f3eadb2f2 100644
--- a/test/fuzz-corpus/dhcp-server/release
+++ b/test/fuzz/fuzz-dhcp-server/release
diff --git a/test/fuzz-corpus/dhcp-server/request-existing b/test/fuzz/fuzz-dhcp-server/request-existing
index 9f7a0d88f7..9f7a0d88f7 100644
--- a/test/fuzz-corpus/dhcp-server/request-existing
+++ b/test/fuzz/fuzz-dhcp-server/request-existing
diff --git a/test/fuzz-corpus/dhcp-server/request-new b/test/fuzz/fuzz-dhcp-server/request-new
index fc6f5864a7..fc6f5864a7 100644
--- a/test/fuzz-corpus/dhcp-server/request-new
+++ b/test/fuzz/fuzz-dhcp-server/request-new
diff --git a/test/fuzz-corpus/dhcp-server/request-reboot b/test/fuzz/fuzz-dhcp-server/request-reboot
index fde74b2b91..fde74b2b91 100644
--- a/test/fuzz-corpus/dhcp-server/request-reboot
+++ b/test/fuzz/fuzz-dhcp-server/request-reboot
diff --git a/test/fuzz-corpus/dhcp-server/request-renew b/test/fuzz/fuzz-dhcp-server/request-renew
index 8dcda2ad88..8dcda2ad88 100644
--- a/test/fuzz-corpus/dhcp-server/request-renew
+++ b/test/fuzz/fuzz-dhcp-server/request-renew
diff --git a/test/fuzz-corpus/journal-remote/invalid-ts.txt b/test/fuzz/fuzz-journal-remote/invalid-ts.txt
index bc036fdcb0..bc036fdcb0 100644
--- a/test/fuzz-corpus/journal-remote/invalid-ts.txt
+++ b/test/fuzz/fuzz-journal-remote/invalid-ts.txt
diff --git a/test/fuzz-corpus/journal-remote/sample.txt b/test/fuzz/fuzz-journal-remote/sample.txt
index 891c0003ef..891c0003ef 100644
--- a/test/fuzz-corpus/journal-remote/sample.txt
+++ b/test/fuzz/fuzz-journal-remote/sample.txt
diff --git a/test/fuzz-corpus/unit-file/dev-mapper-fedora_krowka\x2dswap.swap b/test/fuzz/fuzz-unit-file/dev-mapper-fedora_krowka\x2dswap.swap
index 2886021b1a..2886021b1a 100644
--- a/test/fuzz-corpus/unit-file/dev-mapper-fedora_krowka\x2dswap.swap
+++ b/test/fuzz/fuzz-unit-file/dev-mapper-fedora_krowka\x2dswap.swap
diff --git a/test/fuzz-corpus/unit-file/directives.service b/test/fuzz/fuzz-unit-file/directives.service
index c2334d3b19..c2334d3b19 100644
--- a/test/fuzz-corpus/unit-file/directives.service
+++ b/test/fuzz/fuzz-unit-file/directives.service
diff --git a/test/fuzz-corpus/unit-file/empty.scope b/test/fuzz/fuzz-unit-file/empty.scope
index 8df7245f62..8df7245f62 100644
--- a/test/fuzz-corpus/unit-file/empty.scope
+++ b/test/fuzz/fuzz-unit-file/empty.scope
diff --git a/test/fuzz-corpus/unit-file/machine.slice b/test/fuzz/fuzz-unit-file/machine.slice
index bf8c6bfc3e..bf8c6bfc3e 100644
--- a/test/fuzz-corpus/unit-file/machine.slice
+++ b/test/fuzz/fuzz-unit-file/machine.slice
diff --git a/test/fuzz-corpus/unit-file/proc-sys-fs-binfmt_misc.automount b/test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount
index 777a123ef4..777a123ef4 100644
--- a/test/fuzz-corpus/unit-file/proc-sys-fs-binfmt_misc.automount
+++ b/test/fuzz/fuzz-unit-file/proc-sys-fs-binfmt_misc.automount
diff --git a/test/fuzz-corpus/unit-file/syslog.socket b/test/fuzz/fuzz-unit-file/syslog.socket
index 2eb316fcaa..2eb316fcaa 100644
--- a/test/fuzz-corpus/unit-file/syslog.socket
+++ b/test/fuzz/fuzz-unit-file/syslog.socket
diff --git a/test/fuzz-corpus/unit-file/systemd-ask-password-console.path b/test/fuzz/fuzz-unit-file/systemd-ask-password-console.path
index 3e12c752de..3e12c752de 100644
--- a/test/fuzz-corpus/unit-file/systemd-ask-password-console.path
+++ b/test/fuzz/fuzz-unit-file/systemd-ask-password-console.path
diff --git a/test/fuzz-corpus/unit-file/systemd-machined.service b/test/fuzz/fuzz-unit-file/systemd-machined.service
index 448f062ecf..448f062ecf 100644
--- a/test/fuzz-corpus/unit-file/systemd-machined.service
+++ b/test/fuzz/fuzz-unit-file/systemd-machined.service
diff --git a/test/fuzz-corpus/unit-file/systemd-resolved.service b/test/fuzz/fuzz-unit-file/systemd-resolved.service
index 0854c5f841..0854c5f841 100644
--- a/test/fuzz-corpus/unit-file/systemd-resolved.service
+++ b/test/fuzz/fuzz-unit-file/systemd-resolved.service
diff --git a/test/fuzz-corpus/unit-file/systemd-tmpfiles-clean.timer b/test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer
index 7db361cd69..7db361cd69 100644
--- a/test/fuzz-corpus/unit-file/systemd-tmpfiles-clean.timer
+++ b/test/fuzz/fuzz-unit-file/systemd-tmpfiles-clean.timer
diff --git a/test/fuzz-corpus/unit-file/timers.target b/test/fuzz/fuzz-unit-file/timers.target
index 171226c680..171226c680 100644
--- a/test/fuzz-corpus/unit-file/timers.target
+++ b/test/fuzz/fuzz-unit-file/timers.target
diff --git a/test/fuzz-corpus/unit-file/var-lib-machines.mount b/test/fuzz/fuzz-unit-file/var-lib-machines.mount
index 9c257d1191..9c257d1191 100644
--- a/test/fuzz-corpus/unit-file/var-lib-machines.mount
+++ b/test/fuzz/fuzz-unit-file/var-lib-machines.mount
diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh
index 200407fcca..451cc665ce 100755
--- a/tools/oss-fuzz.sh
+++ b/tools/oss-fuzz.sh
@@ -35,8 +35,10 @@ fi
 meson $build -D$fuzzflag -Db_lundef=false
 ninja -C $build fuzzers
 
-for d in "$(dirname "$0")/../test/fuzz-corpus/"*; do
-        zip -jqr $OUT/fuzz-$(basename "$d")_seed_corpus.zip "$d"
+# The seed corpus is a separate flat archive for each fuzzer,
+# with a fixed name ${fuzzer}_seed_corpus.zip.
+for d in "$(dirname "$0")/../test/fuzz/fuzz-"*; do
+        zip -jqr $OUT/$(basename "$d")_seed_corpus.zip "$d"
 done
 
 # get fuzz-dns-packet corpus