From ad241a2260ed33fa0b0aa40ec65e5a68650eb5f7 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 22 Dec 2016 09:35:53 +0100 Subject: [PATCH] :hammer: moved third-party code into separate folder --- .gitignore | 2 +- test/CMakeLists.txt | 4 +-- test/Makefile | 8 ++--- .../fuzzer-parse_json.cpp} | 34 +++++++++++-------- .../Fuzzer/CMakeLists.txt | 0 .../Fuzzer/FuzzerCorpus.h | 0 .../Fuzzer/FuzzerCrossOver.cpp | 0 .../Fuzzer/FuzzerDefs.h | 0 .../Fuzzer/FuzzerDictionary.h | 0 .../Fuzzer/FuzzerDriver.cpp | 0 .../Fuzzer/FuzzerExtFunctions.def | 0 .../Fuzzer/FuzzerExtFunctions.h | 0 .../Fuzzer/FuzzerExtFunctionsDlsym.cpp | 0 .../Fuzzer/FuzzerExtFunctionsWeak.cpp | 0 .../Fuzzer/FuzzerExtFunctionsWeakAlias.cpp | 0 .../Fuzzer/FuzzerFlags.def | 0 .../Fuzzer/FuzzerIO.cpp | 0 .../Fuzzer/FuzzerIO.h | 0 .../Fuzzer/FuzzerIOPosix.cpp | 0 .../Fuzzer/FuzzerIOWindows.cpp | 0 .../Fuzzer/FuzzerInterface.h | 0 .../Fuzzer/FuzzerInternal.h | 0 .../Fuzzer/FuzzerLoop.cpp | 0 .../Fuzzer/FuzzerMain.cpp | 0 .../Fuzzer/FuzzerMerge.cpp | 0 .../Fuzzer/FuzzerMerge.h | 0 .../Fuzzer/FuzzerMutate.cpp | 0 .../Fuzzer/FuzzerMutate.h | 0 .../Fuzzer/FuzzerOptions.h | 0 .../Fuzzer/FuzzerRandom.h | 0 .../Fuzzer/FuzzerSHA1.cpp | 0 .../Fuzzer/FuzzerSHA1.h | 0 .../Fuzzer/FuzzerTracePC.cpp | 0 .../Fuzzer/FuzzerTracePC.h | 0 .../Fuzzer/FuzzerTraceState.cpp | 0 .../Fuzzer/FuzzerUtil.cpp | 0 .../Fuzzer/FuzzerUtil.h | 0 .../Fuzzer/FuzzerUtilDarwin.cpp | 0 .../Fuzzer/FuzzerUtilLinux.cpp | 0 .../Fuzzer/FuzzerUtilPosix.cpp | 0 .../Fuzzer/FuzzerUtilWindows.cpp | 0 .../Fuzzer/FuzzerValueBitMap.h | 0 .../Fuzzer/README.txt | 0 .../Fuzzer/afl/afl_driver.cpp | 0 .../{fuzz_test => thirdparty}/Fuzzer/build.sh | 0 .../{fuzz_test => thirdparty}/Fuzzer/cxx.dict | 0 .../standalone/StandaloneFuzzTargetMain.c | 0 .../Fuzzer/test/AFLDriverTest.cpp | 0 .../Fuzzer/test/AbsNegAndConstant64Test.cpp | 0 .../Fuzzer/test/AbsNegAndConstantTest.cpp | 0 .../Fuzzer/test/AccumulateAllocationsTest.cpp | 0 .../Fuzzer/test/BufferOverflowOnInput.cpp | 0 .../Fuzzer/test/CMakeLists.txt | 0 .../Fuzzer/test/CallerCalleeTest.cpp | 0 .../Fuzzer/test/CounterTest.cpp | 0 .../Fuzzer/test/CustomCrossOverTest.cpp | 0 .../Fuzzer/test/CustomMutatorTest.cpp | 0 .../Fuzzer/test/DSO1.cpp | 0 .../Fuzzer/test/DSO2.cpp | 0 .../Fuzzer/test/DSOTestExtra.cpp | 0 .../Fuzzer/test/DSOTestMain.cpp | 0 .../Fuzzer/test/DivTest.cpp | 0 .../Fuzzer/test/EmptyTest.cpp | 0 .../test/FourIndependentBranchesTest.cpp | 0 .../Fuzzer/test/FullCoverageSetTest.cpp | 0 .../Fuzzer/test/FuzzerUnittest.cpp | 0 .../Fuzzer/test/InitializeTest.cpp | 0 .../Fuzzer/test/LeakTest.cpp | 0 .../Fuzzer/test/LeakTimeoutTest.cpp | 0 .../Fuzzer/test/LoadTest.cpp | 0 .../Fuzzer/test/MemcmpTest.cpp | 0 .../Fuzzer/test/NthRunCrashTest.cpp | 0 .../Fuzzer/test/NullDerefOnEmptyTest.cpp | 0 .../Fuzzer/test/NullDerefTest.cpp | 0 .../Fuzzer/test/OneHugeAllocTest.cpp | 0 .../test/OutOfMemorySingleLargeMallocTest.cpp | 0 .../Fuzzer/test/OutOfMemoryTest.cpp | 0 .../Fuzzer/test/RepeatedBytesTest.cpp | 0 .../Fuzzer/test/RepeatedMemcmp.cpp | 0 .../Fuzzer/test/ShrinkControlFlowTest.cpp | 0 .../Fuzzer/test/ShrinkValueProfileTest.cpp | 0 .../Fuzzer/test/SignedIntOverflowTest.cpp | 0 .../Fuzzer/test/SimpleCmpTest.cpp | 0 .../Fuzzer/test/SimpleDictionaryTest.cpp | 0 .../Fuzzer/test/SimpleHashTest.cpp | 0 .../Fuzzer/test/SimpleTest.cpp | 0 .../Fuzzer/test/SimpleThreadedTest.cpp | 0 .../Fuzzer/test/SingleMemcmpTest.cpp | 0 .../Fuzzer/test/SingleStrcmpTest.cpp | 0 .../Fuzzer/test/SingleStrncmpTest.cpp | 0 .../Fuzzer/test/SpamyTest.cpp | 0 .../Fuzzer/test/StrcmpTest.cpp | 0 .../Fuzzer/test/StrncmpOOBTest.cpp | 0 .../Fuzzer/test/StrncmpTest.cpp | 0 .../Fuzzer/test/StrstrTest.cpp | 0 .../Fuzzer/test/SwapCmpTest.cpp | 0 .../Fuzzer/test/Switch2Test.cpp | 0 .../Fuzzer/test/SwitchTest.cpp | 0 .../Fuzzer/test/ThreadedLeakTest.cpp | 0 .../Fuzzer/test/ThreadedTest.cpp | 0 .../Fuzzer/test/TimeoutEmptyTest.cpp | 0 .../Fuzzer/test/TimeoutTest.cpp | 0 .../Fuzzer/test/TraceMallocTest.cpp | 0 .../Fuzzer/test/UninstrumentedTest.cpp | 0 .../Fuzzer/test/afl-driver-extra-stats.test | 0 .../Fuzzer/test/afl-driver-stderr.test | 0 .../Fuzzer/test/caller-callee.test | 0 .../Fuzzer/test/coverage.test | 0 .../Fuzzer/test/dict1.txt | 0 .../Fuzzer/test/dump_coverage.test | 0 .../Fuzzer/test/fuzzer-customcrossover.test | 0 .../Fuzzer/test/fuzzer-custommutator.test | 0 .../Fuzzer/test/fuzzer-dict.test | 0 .../Fuzzer/test/fuzzer-dirs.test | 0 .../Fuzzer/test/fuzzer-fdmask.test | 0 .../Fuzzer/test/fuzzer-finalstats.test | 0 .../Fuzzer/test/fuzzer-flags.test | 0 .../Fuzzer/test/fuzzer-jobs.test | 0 .../Fuzzer/test/fuzzer-leak.test | 0 .../Fuzzer/test/fuzzer-oom-with-profile.test | 0 .../Fuzzer/test/fuzzer-oom.test | 0 .../Fuzzer/test/fuzzer-printcovpcs.test | 0 .../Fuzzer/test/fuzzer-runs.test | 0 .../Fuzzer/test/fuzzer-seed.test | 0 .../Fuzzer/test/fuzzer-segv.test | 0 .../Fuzzer/test/fuzzer-singleinputs.test | 0 .../Fuzzer/test/fuzzer-threaded.test | 0 .../Fuzzer/test/fuzzer-timeout.test | 0 .../Fuzzer/test/fuzzer-traces-hooks.test | 0 .../Fuzzer/test/fuzzer-ubsan.test | 0 .../Fuzzer/test/fuzzer.test | 0 .../Fuzzer/test/hi.txt | 0 .../Fuzzer/test/lit.cfg | 0 .../Fuzzer/test/lit.site.cfg.in | 0 .../Fuzzer/test/merge.test | 0 .../Fuzzer/test/minimize_crash.test | 0 .../Fuzzer/test/no-coverage/CMakeLists.txt | 0 .../Fuzzer/test/repeated-bytes.test | 0 .../Fuzzer/test/shrink.test | 0 .../Fuzzer/test/simple-cmp.test | 0 .../Fuzzer/test/standalone.test | 0 .../Fuzzer/test/swap-cmp.test | 0 .../Fuzzer/test/trace-malloc.test | 0 .../Fuzzer/test/ubsan/CMakeLists.txt | 0 .../Fuzzer/test/ulimit.test | 0 .../Fuzzer/test/uninstrumented/CMakeLists.txt | 0 .../Fuzzer/test/unit/lit.cfg | 0 .../Fuzzer/test/unit/lit.site.cfg.in | 0 .../Fuzzer/test/value-profile-cmp.test | 0 .../Fuzzer/test/value-profile-cmp2.test | 0 .../Fuzzer/test/value-profile-cmp3.test | 0 .../Fuzzer/test/value-profile-cmp4.test | 0 .../Fuzzer/test/value-profile-div.test | 0 .../Fuzzer/test/value-profile-load.test | 0 .../Fuzzer/test/value-profile-mem.test | 0 .../Fuzzer/test/value-profile-set.test | 0 .../Fuzzer/test/value-profile-strcmp.test | 0 .../Fuzzer/test/value-profile-strncmp.test | 0 .../Fuzzer/test/value-profile-switch.test | 0 test/{src => thirdparty/catch}/catch.hpp | 0 160 files changed, 27 insertions(+), 21 deletions(-) rename test/{fuzz_test/parse_fuzzer.cc => src/fuzzer-parse_json.cpp} (61%) rename test/{fuzz_test => thirdparty}/Fuzzer/CMakeLists.txt (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerCorpus.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerCrossOver.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerDefs.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerDictionary.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerDriver.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerExtFunctions.def (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerExtFunctions.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerExtFunctionsDlsym.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerExtFunctionsWeak.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerFlags.def (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerIO.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerIO.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerIOPosix.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerIOWindows.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerInterface.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerInternal.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerLoop.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerMain.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerMerge.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerMerge.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerMutate.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerMutate.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerOptions.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerRandom.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerSHA1.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerSHA1.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerTracePC.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerTracePC.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerTraceState.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerUtil.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerUtil.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerUtilDarwin.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerUtilLinux.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerUtilPosix.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerUtilWindows.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/FuzzerValueBitMap.h (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/README.txt (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/afl/afl_driver.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/build.sh (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/cxx.dict (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/standalone/StandaloneFuzzTargetMain.c (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/AFLDriverTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/AbsNegAndConstant64Test.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/AbsNegAndConstantTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/AccumulateAllocationsTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/BufferOverflowOnInput.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/CMakeLists.txt (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/CallerCalleeTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/CounterTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/CustomCrossOverTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/CustomMutatorTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/DSO1.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/DSO2.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/DSOTestExtra.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/DSOTestMain.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/DivTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/EmptyTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/FourIndependentBranchesTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/FullCoverageSetTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/FuzzerUnittest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/InitializeTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/LeakTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/LeakTimeoutTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/LoadTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/MemcmpTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/NthRunCrashTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/NullDerefOnEmptyTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/NullDerefTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/OneHugeAllocTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/OutOfMemoryTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/RepeatedBytesTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/RepeatedMemcmp.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/ShrinkControlFlowTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/ShrinkValueProfileTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SignedIntOverflowTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SimpleCmpTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SimpleDictionaryTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SimpleHashTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SimpleTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SimpleThreadedTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SingleMemcmpTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SingleStrcmpTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SingleStrncmpTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SpamyTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/StrcmpTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/StrncmpOOBTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/StrncmpTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/StrstrTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SwapCmpTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/Switch2Test.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/SwitchTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/ThreadedLeakTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/ThreadedTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/TimeoutEmptyTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/TimeoutTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/TraceMallocTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/UninstrumentedTest.cpp (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/afl-driver-extra-stats.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/afl-driver-stderr.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/caller-callee.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/coverage.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/dict1.txt (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/dump_coverage.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-customcrossover.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-custommutator.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-dict.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-dirs.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-fdmask.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-finalstats.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-flags.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-jobs.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-leak.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-oom-with-profile.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-oom.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-printcovpcs.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-runs.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-seed.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-segv.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-singleinputs.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-threaded.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-timeout.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-traces-hooks.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer-ubsan.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/fuzzer.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/hi.txt (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/lit.cfg (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/lit.site.cfg.in (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/merge.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/minimize_crash.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/no-coverage/CMakeLists.txt (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/repeated-bytes.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/shrink.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/simple-cmp.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/standalone.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/swap-cmp.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/trace-malloc.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/ubsan/CMakeLists.txt (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/ulimit.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/uninstrumented/CMakeLists.txt (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/unit/lit.cfg (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/unit/lit.site.cfg.in (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-cmp.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-cmp2.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-cmp3.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-cmp4.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-div.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-load.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-mem.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-set.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-strcmp.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-strncmp.test (100%) rename test/{fuzz_test => thirdparty}/Fuzzer/test/value-profile-switch.test (100%) rename test/{src => thirdparty/catch}/catch.hpp (100%) diff --git a/.gitignore b/.gitignore index 099cad5c9..104befbe2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,4 @@ cmake-build-debug test/test-* -test/fuzz_test/Fuzzer/.svn +.svn diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f57ddf710..47785aeed 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,7 +1,7 @@ # The unit test executable. set(JSON_UNITTEST_TARGET_NAME "json_unit") add_executable(${JSON_UNITTEST_TARGET_NAME} - "src/catch.hpp" + "thirdparty/catch/catch.hpp" "src/unit.cpp" "src/unit-algorithms.cpp" "src/unit-allocator.cpp" @@ -44,7 +44,7 @@ set_target_properties(${JSON_UNITTEST_TARGET_NAME} PROPERTIES COMPILE_OPTIONS "$<$:/EHsc;$<$:/Od>>" ) -target_include_directories(${JSON_UNITTEST_TARGET_NAME} PRIVATE "src") +target_include_directories(${JSON_UNITTEST_TARGET_NAME} PRIVATE "src" "thirdparty/catch") target_link_libraries(${JSON_UNITTEST_TARGET_NAME} ${JSON_TARGET_NAME}) add_test(NAME "${JSON_UNITTEST_TARGET_NAME}_default" diff --git a/test/Makefile b/test/Makefile index 488cec892..c1fb33f45 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,7 +4,7 @@ # additional flags CXXFLAGS += -std=c++11 -Wall -Wextra -pedantic -Weffc++ -Wcast-align -Wcast-qual -Wno-ctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch -Wundef -Wno-unused -Wnon-virtual-dtor -Wreorder -Wdeprecated -Wno-float-equal -CPPFLAGS += -I ../src -I . +CPPFLAGS += -I ../src -I . -I thirdparty/catch SOURCES = src/unit.cpp \ src/unit-algorithms.cpp \ @@ -57,11 +57,11 @@ clean: # single test file ############################################################################## -json_unit: $(OBJECTS) ../src/json.hpp src/catch.hpp +json_unit: $(OBJECTS) ../src/json.hpp thirdparty/catch/catch.hpp @echo "[CXXLD] $@" @$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ -%.o: %.cpp ../src/json.hpp src/catch.hpp +%.o: %.cpp ../src/json.hpp thirdparty/catch/catch.hpp @echo "[CXX] $@" @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ @@ -70,7 +70,7 @@ json_unit: $(OBJECTS) ../src/json.hpp src/catch.hpp # individual test cases ############################################################################## -test-%: src/unit-%.cpp ../src/json.hpp src/catch.hpp +test-%: src/unit-%.cpp ../src/json.hpp thirdparty/catch/catch.hpp @echo "[CXXLD] $@" @$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -DCATCH_CONFIG_MAIN $< -o $@ diff --git a/test/fuzz_test/parse_fuzzer.cc b/test/src/fuzzer-parse_json.cpp similarity index 61% rename from test/fuzz_test/parse_fuzzer.cc rename to test/src/fuzzer-parse_json.cpp index bb8b3d37c..20a824db9 100644 --- a/test/fuzz_test/parse_fuzzer.cc +++ b/test/src/fuzzer-parse_json.cpp @@ -18,19 +18,25 @@ using json = nlohmann::json; -extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - try { - std::stringstream s; - s << json::parse(data, data + size); - try { - auto j = json::parse(s.str()); - std::stringstream s2; - s2 << j; - assert(s.str() == s2.str()); - assert(j == json::parse(s.str())); - } catch (const std::invalid_argument&) { - assert(0); +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + try + { + std::stringstream s; + s << json::parse(data, data + size); + try + { + auto j = json::parse(s.str()); + std::stringstream s2; + s2 << j; + assert(s.str() == s2.str()); + assert(j == json::parse(s.str())); + } + catch (const std::invalid_argument&) + { + assert(0); + } } - } catch (const std::invalid_argument&) { } - return 0; + catch (const std::invalid_argument&) { } + return 0; } diff --git a/test/fuzz_test/Fuzzer/CMakeLists.txt b/test/thirdparty/Fuzzer/CMakeLists.txt similarity index 100% rename from test/fuzz_test/Fuzzer/CMakeLists.txt rename to test/thirdparty/Fuzzer/CMakeLists.txt diff --git a/test/fuzz_test/Fuzzer/FuzzerCorpus.h b/test/thirdparty/Fuzzer/FuzzerCorpus.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerCorpus.h rename to test/thirdparty/Fuzzer/FuzzerCorpus.h diff --git a/test/fuzz_test/Fuzzer/FuzzerCrossOver.cpp b/test/thirdparty/Fuzzer/FuzzerCrossOver.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerCrossOver.cpp rename to test/thirdparty/Fuzzer/FuzzerCrossOver.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerDefs.h b/test/thirdparty/Fuzzer/FuzzerDefs.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerDefs.h rename to test/thirdparty/Fuzzer/FuzzerDefs.h diff --git a/test/fuzz_test/Fuzzer/FuzzerDictionary.h b/test/thirdparty/Fuzzer/FuzzerDictionary.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerDictionary.h rename to test/thirdparty/Fuzzer/FuzzerDictionary.h diff --git a/test/fuzz_test/Fuzzer/FuzzerDriver.cpp b/test/thirdparty/Fuzzer/FuzzerDriver.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerDriver.cpp rename to test/thirdparty/Fuzzer/FuzzerDriver.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerExtFunctions.def b/test/thirdparty/Fuzzer/FuzzerExtFunctions.def similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerExtFunctions.def rename to test/thirdparty/Fuzzer/FuzzerExtFunctions.def diff --git a/test/fuzz_test/Fuzzer/FuzzerExtFunctions.h b/test/thirdparty/Fuzzer/FuzzerExtFunctions.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerExtFunctions.h rename to test/thirdparty/Fuzzer/FuzzerExtFunctions.h diff --git a/test/fuzz_test/Fuzzer/FuzzerExtFunctionsDlsym.cpp b/test/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerExtFunctionsDlsym.cpp rename to test/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerExtFunctionsWeak.cpp b/test/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerExtFunctionsWeak.cpp rename to test/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp b/test/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp rename to test/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerFlags.def b/test/thirdparty/Fuzzer/FuzzerFlags.def similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerFlags.def rename to test/thirdparty/Fuzzer/FuzzerFlags.def diff --git a/test/fuzz_test/Fuzzer/FuzzerIO.cpp b/test/thirdparty/Fuzzer/FuzzerIO.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerIO.cpp rename to test/thirdparty/Fuzzer/FuzzerIO.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerIO.h b/test/thirdparty/Fuzzer/FuzzerIO.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerIO.h rename to test/thirdparty/Fuzzer/FuzzerIO.h diff --git a/test/fuzz_test/Fuzzer/FuzzerIOPosix.cpp b/test/thirdparty/Fuzzer/FuzzerIOPosix.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerIOPosix.cpp rename to test/thirdparty/Fuzzer/FuzzerIOPosix.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerIOWindows.cpp b/test/thirdparty/Fuzzer/FuzzerIOWindows.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerIOWindows.cpp rename to test/thirdparty/Fuzzer/FuzzerIOWindows.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerInterface.h b/test/thirdparty/Fuzzer/FuzzerInterface.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerInterface.h rename to test/thirdparty/Fuzzer/FuzzerInterface.h diff --git a/test/fuzz_test/Fuzzer/FuzzerInternal.h b/test/thirdparty/Fuzzer/FuzzerInternal.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerInternal.h rename to test/thirdparty/Fuzzer/FuzzerInternal.h diff --git a/test/fuzz_test/Fuzzer/FuzzerLoop.cpp b/test/thirdparty/Fuzzer/FuzzerLoop.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerLoop.cpp rename to test/thirdparty/Fuzzer/FuzzerLoop.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerMain.cpp b/test/thirdparty/Fuzzer/FuzzerMain.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerMain.cpp rename to test/thirdparty/Fuzzer/FuzzerMain.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerMerge.cpp b/test/thirdparty/Fuzzer/FuzzerMerge.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerMerge.cpp rename to test/thirdparty/Fuzzer/FuzzerMerge.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerMerge.h b/test/thirdparty/Fuzzer/FuzzerMerge.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerMerge.h rename to test/thirdparty/Fuzzer/FuzzerMerge.h diff --git a/test/fuzz_test/Fuzzer/FuzzerMutate.cpp b/test/thirdparty/Fuzzer/FuzzerMutate.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerMutate.cpp rename to test/thirdparty/Fuzzer/FuzzerMutate.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerMutate.h b/test/thirdparty/Fuzzer/FuzzerMutate.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerMutate.h rename to test/thirdparty/Fuzzer/FuzzerMutate.h diff --git a/test/fuzz_test/Fuzzer/FuzzerOptions.h b/test/thirdparty/Fuzzer/FuzzerOptions.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerOptions.h rename to test/thirdparty/Fuzzer/FuzzerOptions.h diff --git a/test/fuzz_test/Fuzzer/FuzzerRandom.h b/test/thirdparty/Fuzzer/FuzzerRandom.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerRandom.h rename to test/thirdparty/Fuzzer/FuzzerRandom.h diff --git a/test/fuzz_test/Fuzzer/FuzzerSHA1.cpp b/test/thirdparty/Fuzzer/FuzzerSHA1.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerSHA1.cpp rename to test/thirdparty/Fuzzer/FuzzerSHA1.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerSHA1.h b/test/thirdparty/Fuzzer/FuzzerSHA1.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerSHA1.h rename to test/thirdparty/Fuzzer/FuzzerSHA1.h diff --git a/test/fuzz_test/Fuzzer/FuzzerTracePC.cpp b/test/thirdparty/Fuzzer/FuzzerTracePC.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerTracePC.cpp rename to test/thirdparty/Fuzzer/FuzzerTracePC.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerTracePC.h b/test/thirdparty/Fuzzer/FuzzerTracePC.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerTracePC.h rename to test/thirdparty/Fuzzer/FuzzerTracePC.h diff --git a/test/fuzz_test/Fuzzer/FuzzerTraceState.cpp b/test/thirdparty/Fuzzer/FuzzerTraceState.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerTraceState.cpp rename to test/thirdparty/Fuzzer/FuzzerTraceState.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerUtil.cpp b/test/thirdparty/Fuzzer/FuzzerUtil.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerUtil.cpp rename to test/thirdparty/Fuzzer/FuzzerUtil.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerUtil.h b/test/thirdparty/Fuzzer/FuzzerUtil.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerUtil.h rename to test/thirdparty/Fuzzer/FuzzerUtil.h diff --git a/test/fuzz_test/Fuzzer/FuzzerUtilDarwin.cpp b/test/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerUtilDarwin.cpp rename to test/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerUtilLinux.cpp b/test/thirdparty/Fuzzer/FuzzerUtilLinux.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerUtilLinux.cpp rename to test/thirdparty/Fuzzer/FuzzerUtilLinux.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerUtilPosix.cpp b/test/thirdparty/Fuzzer/FuzzerUtilPosix.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerUtilPosix.cpp rename to test/thirdparty/Fuzzer/FuzzerUtilPosix.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerUtilWindows.cpp b/test/thirdparty/Fuzzer/FuzzerUtilWindows.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerUtilWindows.cpp rename to test/thirdparty/Fuzzer/FuzzerUtilWindows.cpp diff --git a/test/fuzz_test/Fuzzer/FuzzerValueBitMap.h b/test/thirdparty/Fuzzer/FuzzerValueBitMap.h similarity index 100% rename from test/fuzz_test/Fuzzer/FuzzerValueBitMap.h rename to test/thirdparty/Fuzzer/FuzzerValueBitMap.h diff --git a/test/fuzz_test/Fuzzer/README.txt b/test/thirdparty/Fuzzer/README.txt similarity index 100% rename from test/fuzz_test/Fuzzer/README.txt rename to test/thirdparty/Fuzzer/README.txt diff --git a/test/fuzz_test/Fuzzer/afl/afl_driver.cpp b/test/thirdparty/Fuzzer/afl/afl_driver.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/afl/afl_driver.cpp rename to test/thirdparty/Fuzzer/afl/afl_driver.cpp diff --git a/test/fuzz_test/Fuzzer/build.sh b/test/thirdparty/Fuzzer/build.sh similarity index 100% rename from test/fuzz_test/Fuzzer/build.sh rename to test/thirdparty/Fuzzer/build.sh diff --git a/test/fuzz_test/Fuzzer/cxx.dict b/test/thirdparty/Fuzzer/cxx.dict similarity index 100% rename from test/fuzz_test/Fuzzer/cxx.dict rename to test/thirdparty/Fuzzer/cxx.dict diff --git a/test/fuzz_test/Fuzzer/standalone/StandaloneFuzzTargetMain.c b/test/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c similarity index 100% rename from test/fuzz_test/Fuzzer/standalone/StandaloneFuzzTargetMain.c rename to test/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c diff --git a/test/fuzz_test/Fuzzer/test/AFLDriverTest.cpp b/test/thirdparty/Fuzzer/test/AFLDriverTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/AFLDriverTest.cpp rename to test/thirdparty/Fuzzer/test/AFLDriverTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/AbsNegAndConstant64Test.cpp b/test/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/AbsNegAndConstant64Test.cpp rename to test/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp diff --git a/test/fuzz_test/Fuzzer/test/AbsNegAndConstantTest.cpp b/test/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/AbsNegAndConstantTest.cpp rename to test/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/AccumulateAllocationsTest.cpp b/test/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/AccumulateAllocationsTest.cpp rename to test/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/BufferOverflowOnInput.cpp b/test/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/BufferOverflowOnInput.cpp rename to test/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp diff --git a/test/fuzz_test/Fuzzer/test/CMakeLists.txt b/test/thirdparty/Fuzzer/test/CMakeLists.txt similarity index 100% rename from test/fuzz_test/Fuzzer/test/CMakeLists.txt rename to test/thirdparty/Fuzzer/test/CMakeLists.txt diff --git a/test/fuzz_test/Fuzzer/test/CallerCalleeTest.cpp b/test/thirdparty/Fuzzer/test/CallerCalleeTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/CallerCalleeTest.cpp rename to test/thirdparty/Fuzzer/test/CallerCalleeTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/CounterTest.cpp b/test/thirdparty/Fuzzer/test/CounterTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/CounterTest.cpp rename to test/thirdparty/Fuzzer/test/CounterTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/CustomCrossOverTest.cpp b/test/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/CustomCrossOverTest.cpp rename to test/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/CustomMutatorTest.cpp b/test/thirdparty/Fuzzer/test/CustomMutatorTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/CustomMutatorTest.cpp rename to test/thirdparty/Fuzzer/test/CustomMutatorTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/DSO1.cpp b/test/thirdparty/Fuzzer/test/DSO1.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/DSO1.cpp rename to test/thirdparty/Fuzzer/test/DSO1.cpp diff --git a/test/fuzz_test/Fuzzer/test/DSO2.cpp b/test/thirdparty/Fuzzer/test/DSO2.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/DSO2.cpp rename to test/thirdparty/Fuzzer/test/DSO2.cpp diff --git a/test/fuzz_test/Fuzzer/test/DSOTestExtra.cpp b/test/thirdparty/Fuzzer/test/DSOTestExtra.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/DSOTestExtra.cpp rename to test/thirdparty/Fuzzer/test/DSOTestExtra.cpp diff --git a/test/fuzz_test/Fuzzer/test/DSOTestMain.cpp b/test/thirdparty/Fuzzer/test/DSOTestMain.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/DSOTestMain.cpp rename to test/thirdparty/Fuzzer/test/DSOTestMain.cpp diff --git a/test/fuzz_test/Fuzzer/test/DivTest.cpp b/test/thirdparty/Fuzzer/test/DivTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/DivTest.cpp rename to test/thirdparty/Fuzzer/test/DivTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/EmptyTest.cpp b/test/thirdparty/Fuzzer/test/EmptyTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/EmptyTest.cpp rename to test/thirdparty/Fuzzer/test/EmptyTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/FourIndependentBranchesTest.cpp b/test/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/FourIndependentBranchesTest.cpp rename to test/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/FullCoverageSetTest.cpp b/test/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/FullCoverageSetTest.cpp rename to test/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/FuzzerUnittest.cpp b/test/thirdparty/Fuzzer/test/FuzzerUnittest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/FuzzerUnittest.cpp rename to test/thirdparty/Fuzzer/test/FuzzerUnittest.cpp diff --git a/test/fuzz_test/Fuzzer/test/InitializeTest.cpp b/test/thirdparty/Fuzzer/test/InitializeTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/InitializeTest.cpp rename to test/thirdparty/Fuzzer/test/InitializeTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/LeakTest.cpp b/test/thirdparty/Fuzzer/test/LeakTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/LeakTest.cpp rename to test/thirdparty/Fuzzer/test/LeakTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/LeakTimeoutTest.cpp b/test/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/LeakTimeoutTest.cpp rename to test/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/LoadTest.cpp b/test/thirdparty/Fuzzer/test/LoadTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/LoadTest.cpp rename to test/thirdparty/Fuzzer/test/LoadTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/MemcmpTest.cpp b/test/thirdparty/Fuzzer/test/MemcmpTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/MemcmpTest.cpp rename to test/thirdparty/Fuzzer/test/MemcmpTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/NthRunCrashTest.cpp b/test/thirdparty/Fuzzer/test/NthRunCrashTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/NthRunCrashTest.cpp rename to test/thirdparty/Fuzzer/test/NthRunCrashTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/NullDerefOnEmptyTest.cpp b/test/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/NullDerefOnEmptyTest.cpp rename to test/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/NullDerefTest.cpp b/test/thirdparty/Fuzzer/test/NullDerefTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/NullDerefTest.cpp rename to test/thirdparty/Fuzzer/test/NullDerefTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/OneHugeAllocTest.cpp b/test/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/OneHugeAllocTest.cpp rename to test/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp b/test/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp rename to test/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/OutOfMemoryTest.cpp b/test/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/OutOfMemoryTest.cpp rename to test/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/RepeatedBytesTest.cpp b/test/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/RepeatedBytesTest.cpp rename to test/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/RepeatedMemcmp.cpp b/test/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/RepeatedMemcmp.cpp rename to test/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp diff --git a/test/fuzz_test/Fuzzer/test/ShrinkControlFlowTest.cpp b/test/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/ShrinkControlFlowTest.cpp rename to test/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/ShrinkValueProfileTest.cpp b/test/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/ShrinkValueProfileTest.cpp rename to test/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SignedIntOverflowTest.cpp b/test/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SignedIntOverflowTest.cpp rename to test/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SimpleCmpTest.cpp b/test/thirdparty/Fuzzer/test/SimpleCmpTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SimpleCmpTest.cpp rename to test/thirdparty/Fuzzer/test/SimpleCmpTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SimpleDictionaryTest.cpp b/test/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SimpleDictionaryTest.cpp rename to test/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SimpleHashTest.cpp b/test/thirdparty/Fuzzer/test/SimpleHashTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SimpleHashTest.cpp rename to test/thirdparty/Fuzzer/test/SimpleHashTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SimpleTest.cpp b/test/thirdparty/Fuzzer/test/SimpleTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SimpleTest.cpp rename to test/thirdparty/Fuzzer/test/SimpleTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SimpleThreadedTest.cpp b/test/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SimpleThreadedTest.cpp rename to test/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SingleMemcmpTest.cpp b/test/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SingleMemcmpTest.cpp rename to test/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SingleStrcmpTest.cpp b/test/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SingleStrcmpTest.cpp rename to test/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SingleStrncmpTest.cpp b/test/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SingleStrncmpTest.cpp rename to test/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SpamyTest.cpp b/test/thirdparty/Fuzzer/test/SpamyTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SpamyTest.cpp rename to test/thirdparty/Fuzzer/test/SpamyTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/StrcmpTest.cpp b/test/thirdparty/Fuzzer/test/StrcmpTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/StrcmpTest.cpp rename to test/thirdparty/Fuzzer/test/StrcmpTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/StrncmpOOBTest.cpp b/test/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/StrncmpOOBTest.cpp rename to test/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/StrncmpTest.cpp b/test/thirdparty/Fuzzer/test/StrncmpTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/StrncmpTest.cpp rename to test/thirdparty/Fuzzer/test/StrncmpTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/StrstrTest.cpp b/test/thirdparty/Fuzzer/test/StrstrTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/StrstrTest.cpp rename to test/thirdparty/Fuzzer/test/StrstrTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/SwapCmpTest.cpp b/test/thirdparty/Fuzzer/test/SwapCmpTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SwapCmpTest.cpp rename to test/thirdparty/Fuzzer/test/SwapCmpTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/Switch2Test.cpp b/test/thirdparty/Fuzzer/test/Switch2Test.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/Switch2Test.cpp rename to test/thirdparty/Fuzzer/test/Switch2Test.cpp diff --git a/test/fuzz_test/Fuzzer/test/SwitchTest.cpp b/test/thirdparty/Fuzzer/test/SwitchTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/SwitchTest.cpp rename to test/thirdparty/Fuzzer/test/SwitchTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/ThreadedLeakTest.cpp b/test/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/ThreadedLeakTest.cpp rename to test/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/ThreadedTest.cpp b/test/thirdparty/Fuzzer/test/ThreadedTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/ThreadedTest.cpp rename to test/thirdparty/Fuzzer/test/ThreadedTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/TimeoutEmptyTest.cpp b/test/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/TimeoutEmptyTest.cpp rename to test/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/TimeoutTest.cpp b/test/thirdparty/Fuzzer/test/TimeoutTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/TimeoutTest.cpp rename to test/thirdparty/Fuzzer/test/TimeoutTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/TraceMallocTest.cpp b/test/thirdparty/Fuzzer/test/TraceMallocTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/TraceMallocTest.cpp rename to test/thirdparty/Fuzzer/test/TraceMallocTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/UninstrumentedTest.cpp b/test/thirdparty/Fuzzer/test/UninstrumentedTest.cpp similarity index 100% rename from test/fuzz_test/Fuzzer/test/UninstrumentedTest.cpp rename to test/thirdparty/Fuzzer/test/UninstrumentedTest.cpp diff --git a/test/fuzz_test/Fuzzer/test/afl-driver-extra-stats.test b/test/thirdparty/Fuzzer/test/afl-driver-extra-stats.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/afl-driver-extra-stats.test rename to test/thirdparty/Fuzzer/test/afl-driver-extra-stats.test diff --git a/test/fuzz_test/Fuzzer/test/afl-driver-stderr.test b/test/thirdparty/Fuzzer/test/afl-driver-stderr.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/afl-driver-stderr.test rename to test/thirdparty/Fuzzer/test/afl-driver-stderr.test diff --git a/test/fuzz_test/Fuzzer/test/caller-callee.test b/test/thirdparty/Fuzzer/test/caller-callee.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/caller-callee.test rename to test/thirdparty/Fuzzer/test/caller-callee.test diff --git a/test/fuzz_test/Fuzzer/test/coverage.test b/test/thirdparty/Fuzzer/test/coverage.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/coverage.test rename to test/thirdparty/Fuzzer/test/coverage.test diff --git a/test/fuzz_test/Fuzzer/test/dict1.txt b/test/thirdparty/Fuzzer/test/dict1.txt similarity index 100% rename from test/fuzz_test/Fuzzer/test/dict1.txt rename to test/thirdparty/Fuzzer/test/dict1.txt diff --git a/test/fuzz_test/Fuzzer/test/dump_coverage.test b/test/thirdparty/Fuzzer/test/dump_coverage.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/dump_coverage.test rename to test/thirdparty/Fuzzer/test/dump_coverage.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-customcrossover.test b/test/thirdparty/Fuzzer/test/fuzzer-customcrossover.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-customcrossover.test rename to test/thirdparty/Fuzzer/test/fuzzer-customcrossover.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-custommutator.test b/test/thirdparty/Fuzzer/test/fuzzer-custommutator.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-custommutator.test rename to test/thirdparty/Fuzzer/test/fuzzer-custommutator.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-dict.test b/test/thirdparty/Fuzzer/test/fuzzer-dict.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-dict.test rename to test/thirdparty/Fuzzer/test/fuzzer-dict.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-dirs.test b/test/thirdparty/Fuzzer/test/fuzzer-dirs.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-dirs.test rename to test/thirdparty/Fuzzer/test/fuzzer-dirs.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-fdmask.test b/test/thirdparty/Fuzzer/test/fuzzer-fdmask.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-fdmask.test rename to test/thirdparty/Fuzzer/test/fuzzer-fdmask.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-finalstats.test b/test/thirdparty/Fuzzer/test/fuzzer-finalstats.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-finalstats.test rename to test/thirdparty/Fuzzer/test/fuzzer-finalstats.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-flags.test b/test/thirdparty/Fuzzer/test/fuzzer-flags.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-flags.test rename to test/thirdparty/Fuzzer/test/fuzzer-flags.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-jobs.test b/test/thirdparty/Fuzzer/test/fuzzer-jobs.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-jobs.test rename to test/thirdparty/Fuzzer/test/fuzzer-jobs.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-leak.test b/test/thirdparty/Fuzzer/test/fuzzer-leak.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-leak.test rename to test/thirdparty/Fuzzer/test/fuzzer-leak.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-oom-with-profile.test b/test/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-oom-with-profile.test rename to test/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-oom.test b/test/thirdparty/Fuzzer/test/fuzzer-oom.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-oom.test rename to test/thirdparty/Fuzzer/test/fuzzer-oom.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-printcovpcs.test b/test/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-printcovpcs.test rename to test/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-runs.test b/test/thirdparty/Fuzzer/test/fuzzer-runs.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-runs.test rename to test/thirdparty/Fuzzer/test/fuzzer-runs.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-seed.test b/test/thirdparty/Fuzzer/test/fuzzer-seed.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-seed.test rename to test/thirdparty/Fuzzer/test/fuzzer-seed.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-segv.test b/test/thirdparty/Fuzzer/test/fuzzer-segv.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-segv.test rename to test/thirdparty/Fuzzer/test/fuzzer-segv.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-singleinputs.test b/test/thirdparty/Fuzzer/test/fuzzer-singleinputs.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-singleinputs.test rename to test/thirdparty/Fuzzer/test/fuzzer-singleinputs.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-threaded.test b/test/thirdparty/Fuzzer/test/fuzzer-threaded.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-threaded.test rename to test/thirdparty/Fuzzer/test/fuzzer-threaded.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-timeout.test b/test/thirdparty/Fuzzer/test/fuzzer-timeout.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-timeout.test rename to test/thirdparty/Fuzzer/test/fuzzer-timeout.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-traces-hooks.test b/test/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-traces-hooks.test rename to test/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer-ubsan.test b/test/thirdparty/Fuzzer/test/fuzzer-ubsan.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer-ubsan.test rename to test/thirdparty/Fuzzer/test/fuzzer-ubsan.test diff --git a/test/fuzz_test/Fuzzer/test/fuzzer.test b/test/thirdparty/Fuzzer/test/fuzzer.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/fuzzer.test rename to test/thirdparty/Fuzzer/test/fuzzer.test diff --git a/test/fuzz_test/Fuzzer/test/hi.txt b/test/thirdparty/Fuzzer/test/hi.txt similarity index 100% rename from test/fuzz_test/Fuzzer/test/hi.txt rename to test/thirdparty/Fuzzer/test/hi.txt diff --git a/test/fuzz_test/Fuzzer/test/lit.cfg b/test/thirdparty/Fuzzer/test/lit.cfg similarity index 100% rename from test/fuzz_test/Fuzzer/test/lit.cfg rename to test/thirdparty/Fuzzer/test/lit.cfg diff --git a/test/fuzz_test/Fuzzer/test/lit.site.cfg.in b/test/thirdparty/Fuzzer/test/lit.site.cfg.in similarity index 100% rename from test/fuzz_test/Fuzzer/test/lit.site.cfg.in rename to test/thirdparty/Fuzzer/test/lit.site.cfg.in diff --git a/test/fuzz_test/Fuzzer/test/merge.test b/test/thirdparty/Fuzzer/test/merge.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/merge.test rename to test/thirdparty/Fuzzer/test/merge.test diff --git a/test/fuzz_test/Fuzzer/test/minimize_crash.test b/test/thirdparty/Fuzzer/test/minimize_crash.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/minimize_crash.test rename to test/thirdparty/Fuzzer/test/minimize_crash.test diff --git a/test/fuzz_test/Fuzzer/test/no-coverage/CMakeLists.txt b/test/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt similarity index 100% rename from test/fuzz_test/Fuzzer/test/no-coverage/CMakeLists.txt rename to test/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt diff --git a/test/fuzz_test/Fuzzer/test/repeated-bytes.test b/test/thirdparty/Fuzzer/test/repeated-bytes.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/repeated-bytes.test rename to test/thirdparty/Fuzzer/test/repeated-bytes.test diff --git a/test/fuzz_test/Fuzzer/test/shrink.test b/test/thirdparty/Fuzzer/test/shrink.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/shrink.test rename to test/thirdparty/Fuzzer/test/shrink.test diff --git a/test/fuzz_test/Fuzzer/test/simple-cmp.test b/test/thirdparty/Fuzzer/test/simple-cmp.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/simple-cmp.test rename to test/thirdparty/Fuzzer/test/simple-cmp.test diff --git a/test/fuzz_test/Fuzzer/test/standalone.test b/test/thirdparty/Fuzzer/test/standalone.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/standalone.test rename to test/thirdparty/Fuzzer/test/standalone.test diff --git a/test/fuzz_test/Fuzzer/test/swap-cmp.test b/test/thirdparty/Fuzzer/test/swap-cmp.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/swap-cmp.test rename to test/thirdparty/Fuzzer/test/swap-cmp.test diff --git a/test/fuzz_test/Fuzzer/test/trace-malloc.test b/test/thirdparty/Fuzzer/test/trace-malloc.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/trace-malloc.test rename to test/thirdparty/Fuzzer/test/trace-malloc.test diff --git a/test/fuzz_test/Fuzzer/test/ubsan/CMakeLists.txt b/test/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt similarity index 100% rename from test/fuzz_test/Fuzzer/test/ubsan/CMakeLists.txt rename to test/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt diff --git a/test/fuzz_test/Fuzzer/test/ulimit.test b/test/thirdparty/Fuzzer/test/ulimit.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/ulimit.test rename to test/thirdparty/Fuzzer/test/ulimit.test diff --git a/test/fuzz_test/Fuzzer/test/uninstrumented/CMakeLists.txt b/test/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt similarity index 100% rename from test/fuzz_test/Fuzzer/test/uninstrumented/CMakeLists.txt rename to test/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt diff --git a/test/fuzz_test/Fuzzer/test/unit/lit.cfg b/test/thirdparty/Fuzzer/test/unit/lit.cfg similarity index 100% rename from test/fuzz_test/Fuzzer/test/unit/lit.cfg rename to test/thirdparty/Fuzzer/test/unit/lit.cfg diff --git a/test/fuzz_test/Fuzzer/test/unit/lit.site.cfg.in b/test/thirdparty/Fuzzer/test/unit/lit.site.cfg.in similarity index 100% rename from test/fuzz_test/Fuzzer/test/unit/lit.site.cfg.in rename to test/thirdparty/Fuzzer/test/unit/lit.site.cfg.in diff --git a/test/fuzz_test/Fuzzer/test/value-profile-cmp.test b/test/thirdparty/Fuzzer/test/value-profile-cmp.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-cmp.test rename to test/thirdparty/Fuzzer/test/value-profile-cmp.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-cmp2.test b/test/thirdparty/Fuzzer/test/value-profile-cmp2.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-cmp2.test rename to test/thirdparty/Fuzzer/test/value-profile-cmp2.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-cmp3.test b/test/thirdparty/Fuzzer/test/value-profile-cmp3.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-cmp3.test rename to test/thirdparty/Fuzzer/test/value-profile-cmp3.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-cmp4.test b/test/thirdparty/Fuzzer/test/value-profile-cmp4.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-cmp4.test rename to test/thirdparty/Fuzzer/test/value-profile-cmp4.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-div.test b/test/thirdparty/Fuzzer/test/value-profile-div.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-div.test rename to test/thirdparty/Fuzzer/test/value-profile-div.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-load.test b/test/thirdparty/Fuzzer/test/value-profile-load.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-load.test rename to test/thirdparty/Fuzzer/test/value-profile-load.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-mem.test b/test/thirdparty/Fuzzer/test/value-profile-mem.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-mem.test rename to test/thirdparty/Fuzzer/test/value-profile-mem.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-set.test b/test/thirdparty/Fuzzer/test/value-profile-set.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-set.test rename to test/thirdparty/Fuzzer/test/value-profile-set.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-strcmp.test b/test/thirdparty/Fuzzer/test/value-profile-strcmp.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-strcmp.test rename to test/thirdparty/Fuzzer/test/value-profile-strcmp.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-strncmp.test b/test/thirdparty/Fuzzer/test/value-profile-strncmp.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-strncmp.test rename to test/thirdparty/Fuzzer/test/value-profile-strncmp.test diff --git a/test/fuzz_test/Fuzzer/test/value-profile-switch.test b/test/thirdparty/Fuzzer/test/value-profile-switch.test similarity index 100% rename from test/fuzz_test/Fuzzer/test/value-profile-switch.test rename to test/thirdparty/Fuzzer/test/value-profile-switch.test diff --git a/test/src/catch.hpp b/test/thirdparty/catch/catch.hpp similarity index 100% rename from test/src/catch.hpp rename to test/thirdparty/catch/catch.hpp