Switch back to libFuzzer style

Signed-off-by: Geoff Hutchison <[email protected]>
OpenChemistry · Jan 20, 2025 · 820d90c · 820d90c
1 parent 07a67f6
commit 820d90c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 27 deletions.
diff --git a/tests/io/CMakeLists.txt b/tests/io/CMakeLists.txt
@@ -54,15 +54,11 @@ endforeach()
 
 option(ENABLE_FUZZ "Enable fuzz testing." OFF)
 
-if(ENABLE_FUZZ)
-  add_definitions(-DFUZZTEST_FUZZING_MODE=on)
-  # fuzztest uses abseil-cpp
-  set(CMAKE_CXX_STANDARD 17)
-  set(CMAKE_CXX_VISIBILITY_PRESET default)
-  add_subdirectory(fuzztest)
+if(ENABLE_FUZZ OR DEFINED ENV{LIB_FUZZING_ENGINE})
+  add_executable(fuzz_cjson fuzztest.cpp)
+  target_compile_options(fuzz_cjson PRIVATE -g -fsanitize=fuzzer)
+  target_link_libraries(fuzz_cjson PRIVATE Avogadro::IO $ENV{LIB_FUZZING_ENGINE})
 
-  fuzztest_setup_fuzzing_flags()
-  add_executable(AvogadroFuzzTests fuzztest.cpp)
-  target_link_libraries(AvogadroFuzzTests PRIVATE Avogadro::IO)
-  link_fuzztest(AvogadroFuzzTests)
+  # todo use a modular input format
+  # target_compile_definitions(fuzz_cjson PRIVATE -DFUZZ_INPUT_FORMAT="cjson")
 endif()
diff --git a/tests/io/fuzztest.cpp b/tests/io/fuzztest.cpp
@@ -3,30 +3,19 @@
   This source code is released under the 3-Clause BSD License, (see "LICENSE").
 ******************************************************************************/
 
-#include "fuzztest/fuzztest.h"
-#include "iotests.h"
-
-#include <gtest/gtest.h>
-
-#include <avogadro/core/matrix.h>
 #include <avogadro/core/molecule.h>
-#include <avogadro/core/unitcell.h>
-
 #include <avogadro/io/cjsonformat.h>
 
 using Avogadro::Core::Molecule;
 using Avogadro::Io::CjsonFormat;
 
-static const std::string cjsonDir = std::string(AVOGADRO_DATA) + "/data/cjson/";
-
-void readCjson(const std::string& data)
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size)
 {
+  std::string input(reinterpret_cast<const char*>(Data), Size);
+
   CjsonFormat cjson;
   Molecule molecule;
-  bool success = cjson.readString(data, molecule);
-  EXPECT_TRUE(success);
-  EXPECT_EQ(cjson.error(), "");
-}
+  bool success = cjson.readString(input, molecule);
 
-FUZZ_TEST(AvogadroFuzzTests, readCjson)
-  .WithSeeds(fuzztest::ReadFilesFromDirectory(cjsonDir));
+  return 0;
+}