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.
2018-07-07 17:43:40 +02:00 · 2018-07-07 17:43:40 +02:00 · 93b575b266
parent 861cf7c95b
commit 93b575b266
23 changed files with 4 additions and 2 deletions
--- a/test/fuzz-corpus/.gitattributes
+++ b/test/fuzz-corpus/.gitattributes
--- a/test/fuzz-corpus/dhcp-server/discover-existing
+++ b/test/fuzz-corpus/dhcp-server/discover-existing
--- a/test/fuzz-corpus/dhcp-server/discover-new
+++ b/test/fuzz-corpus/dhcp-server/discover-new
--- a/test/fuzz-corpus/dhcp-server/release
+++ b/test/fuzz-corpus/dhcp-server/release
--- a/test/fuzz-corpus/dhcp-server/request-existing
+++ b/test/fuzz-corpus/dhcp-server/request-existing
--- a/test/fuzz-corpus/dhcp-server/request-new
+++ b/test/fuzz-corpus/dhcp-server/request-new
--- a/test/fuzz-corpus/dhcp-server/request-reboot
+++ b/test/fuzz-corpus/dhcp-server/request-reboot
--- a/test/fuzz-corpus/dhcp-server/request-renew
+++ b/test/fuzz-corpus/dhcp-server/request-renew
--- a/test/fuzz-corpus/journal-remote/invalid-ts.txt
+++ b/test/fuzz-corpus/journal-remote/invalid-ts.txt
--- a/test/fuzz-corpus/journal-remote/sample.txt
+++ b/test/fuzz-corpus/journal-remote/sample.txt
--- a/test/fuzz-corpus/unit-file/dev-mapper-fedora_krowka\x2dswap.swap
+++ b/test/fuzz-corpus/unit-file/dev-mapper-fedora_krowka\x2dswap.swap
--- a/test/fuzz-corpus/unit-file/directives.service
+++ b/test/fuzz-corpus/unit-file/directives.service
--- a/test/fuzz-corpus/unit-file/empty.scope
+++ b/test/fuzz-corpus/unit-file/empty.scope
--- a/test/fuzz-corpus/unit-file/machine.slice
+++ b/test/fuzz-corpus/unit-file/machine.slice
--- a/test/fuzz-corpus/unit-file/proc-sys-fs-binfmt_misc.automount
+++ b/test/fuzz-corpus/unit-file/proc-sys-fs-binfmt_misc.automount
--- a/test/fuzz-corpus/unit-file/syslog.socket
+++ b/test/fuzz-corpus/unit-file/syslog.socket
--- a/test/fuzz-corpus/unit-file/systemd-ask-password-console.path
+++ b/test/fuzz-corpus/unit-file/systemd-ask-password-console.path
--- a/test/fuzz-corpus/unit-file/systemd-machined.service
+++ b/test/fuzz-corpus/unit-file/systemd-machined.service
--- a/test/fuzz-corpus/unit-file/systemd-resolved.service
+++ b/test/fuzz-corpus/unit-file/systemd-resolved.service
--- a/test/fuzz-corpus/unit-file/systemd-tmpfiles-clean.timer
+++ b/test/fuzz-corpus/unit-file/systemd-tmpfiles-clean.timer
--- a/test/fuzz-corpus/unit-file/timers.target
+++ b/test/fuzz-corpus/unit-file/timers.target
--- a/test/fuzz-corpus/unit-file/var-lib-machines.mount
+++ b/test/fuzz-corpus/unit-file/var-lib-machines.mount
--- 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