Blame SOURCES/0153-fuzz-unify-the-fuzz-regressions-directory-with-the-m.patch

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