diff --git a/meson.build b/meson.build index c29f622143..31d73aacfa 100644 --- a/meson.build +++ b/meson.build @@ -2847,9 +2847,7 @@ foreach tuple : sanitizers test('@0@:@1@:@2@'.format(b, c, sanitizer), env, args : [exe.full_path(), - join_paths(meson.source_root(), - 'test/fuzz-regressions', - p)]) + join_paths(meson.source_root(), 'test/fuzz', p)]) endif endforeach endif diff --git a/test/fuzz-regressions/.gitattributes b/test/fuzz-regressions/.gitattributes deleted file mode 100644 index 7b1b3e1835..0000000000 --- a/test/fuzz-regressions/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/*/* -whitespace diff --git a/test/fuzz-regressions/fuzz-dhcp6-client/crash-4003c06fce43a11fbd22f02584df2807ac333eae b/test/fuzz/fuzz-dhcp6-client/crash-4003c06fce43a11fbd22f02584df2807ac333eae similarity index 100% rename from test/fuzz-regressions/fuzz-dhcp6-client/crash-4003c06fce43a11fbd22f02584df2807ac333eae rename to test/fuzz/fuzz-dhcp6-client/crash-4003c06fce43a11fbd22f02584df2807ac333eae diff --git a/test/fuzz-regressions/fuzz-dhcp6-client/crash-6e88fcb6b85c9436bcbe05219aa8e550194645ef b/test/fuzz/fuzz-dhcp6-client/crash-6e88fcb6b85c9436bcbe05219aa8e550194645ef similarity index 100% rename from test/fuzz-regressions/fuzz-dhcp6-client/crash-6e88fcb6b85c9436bcbe05219aa8e550194645ef rename to test/fuzz/fuzz-dhcp6-client/crash-6e88fcb6b85c9436bcbe05219aa8e550194645ef diff --git a/test/fuzz-regressions/fuzz-dns-packet/issue-7888 b/test/fuzz/fuzz-dns-packet/issue-7888 similarity index 100% rename from test/fuzz-regressions/fuzz-dns-packet/issue-7888 rename to test/fuzz/fuzz-dns-packet/issue-7888 diff --git a/test/fuzz-regressions/fuzz-dns-packet/oss-fuzz-5465 b/test/fuzz/fuzz-dns-packet/oss-fuzz-5465 similarity index 100% rename from test/fuzz-regressions/fuzz-dns-packet/oss-fuzz-5465 rename to test/fuzz/fuzz-dns-packet/oss-fuzz-5465 diff --git a/test/fuzz-regressions/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76 b/test/fuzz/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76 similarity index 100% rename from test/fuzz-regressions/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76 rename to test/fuzz/fuzz-journal-remote/crash-5a8f03d4c3a46fcded39527084f437e8e4b54b76 diff --git a/test/fuzz-regressions/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45 b/test/fuzz/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45 similarity index 100% rename from test/fuzz-regressions/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45 rename to test/fuzz/fuzz-journal-remote/crash-96dee870ea66d03e89ac321eee28ea63a9b9aa45 diff --git a/test/fuzz-regressions/fuzz-journal-remote/oss-fuzz-8659 b/test/fuzz/fuzz-journal-remote/oss-fuzz-8659 similarity index 100% rename from test/fuzz-regressions/fuzz-journal-remote/oss-fuzz-8659 rename to test/fuzz/fuzz-journal-remote/oss-fuzz-8659 diff --git a/test/fuzz-regressions/fuzz-journal-remote/oss-fuzz-8686 b/test/fuzz/fuzz-journal-remote/oss-fuzz-8686 similarity index 100% rename from test/fuzz-regressions/fuzz-journal-remote/oss-fuzz-8686 rename to test/fuzz/fuzz-journal-remote/oss-fuzz-8686 diff --git a/test/fuzz-regressions/fuzz-journald-syslog/github-9795 b/test/fuzz/fuzz-journald-syslog/github-9795 similarity index 100% rename from test/fuzz-regressions/fuzz-journald-syslog/github-9795 rename to test/fuzz/fuzz-journald-syslog/github-9795 diff --git a/test/fuzz-regressions/fuzz-journald-syslog/github-9820 b/test/fuzz/fuzz-journald-syslog/github-9820 similarity index 100% rename from test/fuzz-regressions/fuzz-journald-syslog/github-9820 rename to test/fuzz/fuzz-journald-syslog/github-9820 diff --git a/test/fuzz-regressions/fuzz-journald-syslog/github-9827 b/test/fuzz/fuzz-journald-syslog/github-9827 similarity index 100% rename from test/fuzz-regressions/fuzz-journald-syslog/github-9827 rename to test/fuzz/fuzz-journald-syslog/github-9827 diff --git a/test/fuzz-regressions/fuzz-journald-syslog/github-9829 b/test/fuzz/fuzz-journald-syslog/github-9829 similarity index 100% rename from test/fuzz-regressions/fuzz-journald-syslog/github-9829 rename to test/fuzz/fuzz-journald-syslog/github-9829 diff --git a/test/fuzz-regressions/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 b/test/fuzz/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 similarity index 100% rename from test/fuzz-regressions/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 rename to test/fuzz/fuzz-ndisc-rs/timeout-2815b773c712fa33bea62f541dfa3017c64ea2f1 diff --git a/test/fuzz-regressions/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b b/test/fuzz/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b similarity index 100% rename from test/fuzz-regressions/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b rename to test/fuzz/fuzz-ndisc-rs/timeout-61fff7fd1e5dcc07e1b656baab29065ce634ad5b diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-10007 b/test/fuzz/fuzz-unit-file/oss-fuzz-10007 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-10007 rename to test/fuzz/fuzz-unit-file/oss-fuzz-10007 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6884 b/test/fuzz/fuzz-unit-file/oss-fuzz-6884 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6884 rename to test/fuzz/fuzz-unit-file/oss-fuzz-6884 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6885 b/test/fuzz/fuzz-unit-file/oss-fuzz-6885 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6885 rename to test/fuzz/fuzz-unit-file/oss-fuzz-6885 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6886 b/test/fuzz/fuzz-unit-file/oss-fuzz-6886 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6886 rename to test/fuzz/fuzz-unit-file/oss-fuzz-6886 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6892 b/test/fuzz/fuzz-unit-file/oss-fuzz-6892 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6892 rename to test/fuzz/fuzz-unit-file/oss-fuzz-6892 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6897 b/test/fuzz/fuzz-unit-file/oss-fuzz-6897 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6897 rename to test/fuzz/fuzz-unit-file/oss-fuzz-6897 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6897-evverx b/test/fuzz/fuzz-unit-file/oss-fuzz-6897-evverx similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6897-evverx rename to test/fuzz/fuzz-unit-file/oss-fuzz-6897-evverx diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6908 b/test/fuzz/fuzz-unit-file/oss-fuzz-6908 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6908 rename to test/fuzz/fuzz-unit-file/oss-fuzz-6908 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6917 b/test/fuzz/fuzz-unit-file/oss-fuzz-6917 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6917 rename to test/fuzz/fuzz-unit-file/oss-fuzz-6917 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6977 b/test/fuzz/fuzz-unit-file/oss-fuzz-6977 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6977 rename to test/fuzz/fuzz-unit-file/oss-fuzz-6977 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6977-unminimized b/test/fuzz/fuzz-unit-file/oss-fuzz-6977-unminimized similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-6977-unminimized rename to test/fuzz/fuzz-unit-file/oss-fuzz-6977-unminimized diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-7004 b/test/fuzz/fuzz-unit-file/oss-fuzz-7004 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-7004 rename to test/fuzz/fuzz-unit-file/oss-fuzz-7004 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-8064 b/test/fuzz/fuzz-unit-file/oss-fuzz-8064 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-8064 rename to test/fuzz/fuzz-unit-file/oss-fuzz-8064 diff --git a/test/fuzz-regressions/fuzz-unit-file/oss-fuzz-8827 b/test/fuzz/fuzz-unit-file/oss-fuzz-8827 similarity index 100% rename from test/fuzz-regressions/fuzz-unit-file/oss-fuzz-8827 rename to test/fuzz/fuzz-unit-file/oss-fuzz-8827 diff --git a/test/fuzz-regressions/meson.build b/test/fuzz/meson.build similarity index 100% rename from test/fuzz-regressions/meson.build rename to test/fuzz/meson.build diff --git a/test/meson.build b/test/meson.build index 9750ff22b9..37034fca96 100644 --- a/test/meson.build +++ b/test/meson.build @@ -256,4 +256,4 @@ if conf.get('ENABLE_HWDB') == 1 endif endif -subdir('fuzz-regressions') +subdir('fuzz')