ff6046
From 338519bd5d676d3f7bb5d58f4dac9fb6814afa78 Mon Sep 17 00:00:00 2001
ff6046
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
ff6046
Date: Sat, 7 Jul 2018 18:09:21 +0200
ff6046
Subject: [PATCH] fuzz: unify the "fuzz-regressions" directory with the main
ff6046
 corpus
ff6046
ff6046
There isn't really much need to keep them separate. Anything which is a good
ff6046
corpus entry can be used as a smoke test, and anything which which is a
ff6046
regression test can just as well be inserted into the corpus.
ff6046
ff6046
The only functional difference from this patch (apart from different paths in
ff6046
output) is that the regression tests are now zipped together with the rest of
ff6046
the corpus.
ff6046
ff6046
$ meson configure build -Dslow-tests=true && ninja -C build test
ff6046
...
ff6046
307/325 fuzz-dns-packet:issue-7888:address      OK       0.06 s
ff6046
308/325 fuzz-dns-packet:oss-fuzz-5465:address   OK       0.04 s
ff6046
309/325 fuzz-journal-remote:crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76:address  OK       0.07 s
ff6046
310/325 fuzz-journal-remote:crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45:address  OK       0.05 s
ff6046
311/325 fuzz-journal-remote:oss-fuzz-8659:address  OK       0.05 s
ff6046
312/325 fuzz-journal-remote:oss-fuzz-8686:address  OK       0.07 s
ff6046
313/325 fuzz-unit-file:oss-fuzz-6884:address    OK       0.06 s
ff6046
314/325 fuzz-unit-file:oss-fuzz-6885:address    OK       0.05 s
ff6046
315/325 fuzz-unit-file:oss-fuzz-6886:address    OK       0.05 s
ff6046
316/325 fuzz-unit-file:oss-fuzz-6892:address    OK       0.05 s
ff6046
317/325 fuzz-unit-file:oss-fuzz-6897:address    OK       0.05 s
ff6046
318/325 fuzz-unit-file:oss-fuzz-6897-evverx:address  OK       0.06 s
ff6046
319/325 fuzz-unit-file:oss-fuzz-6908:address    OK       0.07 s
ff6046
320/325 fuzz-unit-file:oss-fuzz-6917:address    OK       0.07 s
ff6046
321/325 fuzz-unit-file:oss-fuzz-6977:address    OK       0.13 s
ff6046
322/325 fuzz-unit-file:oss-fuzz-6977-unminimized:address  OK       0.12 s
ff6046
323/325 fuzz-unit-file:oss-fuzz-7004:address    OK       0.05 s
ff6046
324/325 fuzz-unit-file:oss-fuzz-8064:address    OK       0.05 s
ff6046
325/325 fuzz-unit-file:oss-fuzz-8827:address    OK       0.52 s
ff6046
ff6046
(cherry picked from commit c74a3f973e3e0bac13d66a28728a47f10046b71f)
ff6046
ff6046
Resolves: #1696224
ff6046
---
ff6046
 meson.build                                         |   4 +---
ff6046
 test/fuzz-regressions/.gitattributes                |   1 -
ff6046
 .../fuzz-dns-packet/issue-7888                      | Bin
ff6046
 .../fuzz-dns-packet/oss-fuzz-5465                   | Bin
ff6046
 .../crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76  | Bin
ff6046
 .../crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45  | Bin
ff6046
 .../fuzz-journal-remote/oss-fuzz-8659               |   0
ff6046
 .../fuzz-journal-remote/oss-fuzz-8686               |   0
ff6046
 .../fuzz-journald-syslog/github-9795                |   0
ff6046
 .../fuzz-journald-syslog/github-9820                |   0
ff6046
 .../fuzz-journald-syslog/github-9827                |   0
ff6046
 .../fuzz-journald-syslog/github-9829                |   0
ff6046
 ...timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 | Bin
ff6046
 ...timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b | Bin
ff6046
 .../fuzz-unit-file/oss-fuzz-10007                   |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6884                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6885                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6886                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6892                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6897                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6897-evverx             |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6908                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6917                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6977                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-6977-unminimized        |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-7004                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-8064                    |   0
ff6046
 .../fuzz-unit-file/oss-fuzz-8827                    |   0
ff6046
 test/{fuzz-regressions => fuzz}/meson.build         |   0
ff6046
 test/meson.build                                    |   2 +-
ff6046
 30 files changed, 2 insertions(+), 5 deletions(-)
ff6046
 delete mode 100644 test/fuzz-regressions/.gitattributes
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-dns-packet/issue-7888 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-dns-packet/oss-fuzz-5465 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-journal-remote/oss-fuzz-8659 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-journal-remote/oss-fuzz-8686 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-journald-syslog/github-9795 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-journald-syslog/github-9820 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-journald-syslog/github-9827 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-journald-syslog/github-9829 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-10007 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6884 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6885 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6886 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6892 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6897 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6897-evverx (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6908 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6917 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6977 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-6977-unminimized (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-7004 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-8064 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/fuzz-unit-file/oss-fuzz-8827 (100%)
ff6046
 rename test/{fuzz-regressions => fuzz}/meson.build (100%)
ff6046
ff6046
diff --git a/meson.build b/meson.build
ff6046
index f2d67b7e02..709597e5c4 100644
ff6046
--- a/meson.build
ff6046
+++ b/meson.build
ff6046
@@ -2777,9 +2777,7 @@ foreach tuple : sanitizers
ff6046
                                 test('@0@:@1@:@2@'.format(b, c, sanitizer),
ff6046
                                      env,
ff6046
                                      args : [exe.full_path(),
ff6046
-                                             join_paths(meson.source_root(),
ff6046
-                                                        'test/fuzz-regressions',
ff6046
-                                                        p)])
ff6046
+                                             join_paths(meson.source_root(), 'test/fuzz', p)])
ff6046
                         endif
ff6046
                 endforeach
ff6046
         endif
ff6046
diff --git a/test/fuzz-regressions/.gitattributes b/test/fuzz-regressions/.gitattributes
ff6046
deleted file mode 100644
ff6046
index 7b1b3e1835..0000000000
ff6046
--- a/test/fuzz-regressions/.gitattributes
ff6046
+++ /dev/null
ff6046
@@ -1 +0,0 @@
ff6046
-/*/*       -whitespace
ff6046
diff --git a/test/fuzz-regressions/fuzz-dns-packet/issue-7888 b/test/fuzz/fuzz-dns-packet/issue-7888
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-dns-packet/issue-7888
ff6046
rename to test/fuzz/fuzz-dns-packet/issue-7888
ff6046
diff --git a/test/fuzz-regressions/fuzz-dns-packet/oss-fuzz-5465 b/test/fuzz/fuzz-dns-packet/oss-fuzz-5465
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-dns-packet/oss-fuzz-5465
ff6046
rename to test/fuzz/fuzz-dns-packet/oss-fuzz-5465
ff6046
diff --git a/test/fuzz-regressions/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76 b/test/fuzz/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76
ff6046
rename to test/fuzz/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76
ff6046
diff --git a/test/fuzz-regressions/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45 b/test/fuzz/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45
ff6046
rename to test/fuzz/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45
ff6046
diff --git a/test/fuzz-regressions/fuzz-journal-remote/oss-fuzz-8659 b/test/fuzz/fuzz-journal-remote/oss-fuzz-8659
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-journal-remote/oss-fuzz-8659
ff6046
rename to test/fuzz/fuzz-journal-remote/oss-fuzz-8659
ff6046
diff --git a/test/fuzz-regressions/fuzz-journal-remote/oss-fuzz-8686 b/test/fuzz/fuzz-journal-remote/oss-fuzz-8686
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-journal-remote/oss-fuzz-8686
ff6046
rename to test/fuzz/fuzz-journal-remote/oss-fuzz-8686
ff6046
diff --git a/test/fuzz-regressions/fuzz-journald-syslog/github-9795 b/test/fuzz/fuzz-journald-syslog/github-9795
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-journald-syslog/github-9795
ff6046
rename to test/fuzz/fuzz-journald-syslog/github-9795
ff6046
diff --git a/test/fuzz-regressions/fuzz-journald-syslog/github-9820 b/test/fuzz/fuzz-journald-syslog/github-9820
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-journald-syslog/github-9820
ff6046
rename to test/fuzz/fuzz-journald-syslog/github-9820
ff6046
diff --git a/test/fuzz-regressions/fuzz-journald-syslog/github-9827 b/test/fuzz/fuzz-journald-syslog/github-9827
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-journald-syslog/github-9827
ff6046
rename to test/fuzz/fuzz-journald-syslog/github-9827
ff6046
diff --git a/test/fuzz-regressions/fuzz-journald-syslog/github-9829 b/test/fuzz/fuzz-journald-syslog/github-9829
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-journald-syslog/github-9829
ff6046
rename to test/fuzz/fuzz-journald-syslog/github-9829
ff6046
diff --git a/test/fuzz-regressions/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 b/test/fuzz/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1
ff6046
rename to test/fuzz/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1
ff6046
diff --git a/test/fuzz-regressions/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b b/test/fuzz/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b
ff6046
rename to test/fuzz/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-10007 b/test/fuzz/fuzz-unit-file/oss-fuzz-10007
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-10007
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-10007
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6884 b/test/fuzz/fuzz-unit-file/oss-fuzz-6884
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6884
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6884
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6885 b/test/fuzz/fuzz-unit-file/oss-fuzz-6885
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6885
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6885
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6886 b/test/fuzz/fuzz-unit-file/oss-fuzz-6886
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6886
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6886
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6892 b/test/fuzz/fuzz-unit-file/oss-fuzz-6892
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6892
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6892
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6897 b/test/fuzz/fuzz-unit-file/oss-fuzz-6897
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6897
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6897
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6897-evverx b/test/fuzz/fuzz-unit-file/oss-fuzz-6897-evverx
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6897-evverx
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6897-evverx
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6908 b/test/fuzz/fuzz-unit-file/oss-fuzz-6908
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6908
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6908
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6917 b/test/fuzz/fuzz-unit-file/oss-fuzz-6917
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6917
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6917
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6977 b/test/fuzz/fuzz-unit-file/oss-fuzz-6977
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6977
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6977
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6977-unminimized b/test/fuzz/fuzz-unit-file/oss-fuzz-6977-unminimized
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6977-unminimized
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-6977-unminimized
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-7004 b/test/fuzz/fuzz-unit-file/oss-fuzz-7004
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-7004
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-7004
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-8064 b/test/fuzz/fuzz-unit-file/oss-fuzz-8064
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-8064
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-8064
ff6046
diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-8827 b/test/fuzz/fuzz-unit-file/oss-fuzz-8827
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-8827
ff6046
rename to test/fuzz/fuzz-unit-file/oss-fuzz-8827
ff6046
diff --git a/test/fuzz-regressions/meson.build b/test/fuzz/meson.build
ff6046
similarity index 100%
ff6046
rename from test/fuzz-regressions/meson.build
ff6046
rename to test/fuzz/meson.build
ff6046
diff --git a/test/meson.build b/test/meson.build
ff6046
index 826e684e59..fb9f2cdb9b 100644
ff6046
--- a/test/meson.build
ff6046
+++ b/test/meson.build
ff6046
@@ -244,4 +244,4 @@ if conf.get('ENABLE_HWDB') == 1
ff6046
              timeout : 90)
ff6046
 endif
ff6046
 
ff6046
-subdir('fuzz-regressions')
ff6046
+subdir('fuzz')