daandemeyer / rpms / systemd

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