From 0e0f105e984eeac51147b5fd87cf95668e8fa235 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Fri, 4 Aug 2023 10:57:32 +0800
Subject: [PATCH] Use system Catch2 and Melkor.

---
 tests/CMakeLists.txt     | 47 ++++------------------------------------
 tests/test_iterators.cpp |  2 +-
 2 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1d34b711..cf79ab74 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,23 +8,6 @@ set(LIEF_EXAMPLES_DIRECTORY  "${PROJECT_SOURCE_DIR}/examples")
 set(LIEF_EXAMPLES_BINARY_DIR "${PROJECT_BINARY_DIR}/examples")
 
 
-# Catch
-# =====
-set(CATCH_VERSION 2.13.8)
-set(CATCH_SHA256 SHA256=532f163e4f2db66dae33f1d0a279e8d9befec8bc6cca60d7b82155f7d06bd89c)
-set(CATCH_URL "${THIRD_PARTY_DIRECTORY}/Catch2-${CATCH_VERSION}.zip" CACHE STRING "URL to the Catch repo")
-
-ExternalProject_Add(catch
-    PREFIX         ${CATCH_PREFIX}
-    URL            ${CATCH_URL}
-    URL_HASH       ${CATCH_SHA256}
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-)
-ExternalProject_Get_Property(catch source_dir)
-set(CATCH_INCLUDE_DIR "${source_dir}" CACHE INTERNAL "Path to include folder for Catch")
-
 # Code covergage
 # ==============
 if(LIEF_COVERAGE)
@@ -58,31 +41,6 @@ if(LIEF_COVERAGE)
 endif()
 
 
-# Fuzzing
-# =======
-if(UNIX AND NOT APPLE)
-  set(MELKOR_VERSION ac2495b) # From the fork: https://github.com/romainthomas/elf_fuzzer
-  set(MELKOR_SHA256 SHA256=8cccc4ca5e05e305215cc74761413746b660b76f5869a563f52cec1f23d79f2e)
-  set(MELKOR_URL "${THIRD_PARTY_DIRECTORY}/Melkor_ELF_Fuzzer-${MELKOR_VERSION}.zip" CACHE STRING "URL to the Melkor package")
-
-  set(MELKOR_PREFIX      "${CMAKE_CURRENT_BINARY_DIR}/Melkor")
-  set(MELKOR_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/Melkor")
-  ExternalProject_Add(MELKOR
-   PREFIX            ${MELKOR_PREFIX}
-   URL               ${MELKOR_URL}
-   URL_HASH          ${MELKOR_SHA256}
-   INSTALL_DIR       ${MELKOR_INSTALL_DIR}
-   UPDATE_COMMAND    ""
-   CONFIGURE_COMMAND ""
-   INSTALL_COMMAND   ""
-   BUILD_COMMAND     make clean && make
-   BUILD_IN_SOURCE   ON)
-
-  ExternalProject_get_property(MELKOR SOURCE_DIR)
-  set(MELKOR_BINARY "${SOURCE_DIR}/melkor")
-  message(STATUS "${MELKOR_BINARY}")
-endif()
-
 # Tests
 # =====
 add_executable(test_iterators "${CMAKE_CURRENT_SOURCE_DIR}/test_iterators.cpp")
@@ -100,10 +58,13 @@ if (LIEF_COVERAGE)
   target_link_libraries(test_iterators gcov)
 endif()
 
-add_dependencies(test_iterators catch LIB_LIEF)
+find_package(Catch2 REQUIRED)
+add_dependencies(test_iterators Catch2::Catch2 LIB_LIEF)
 
 target_link_libraries(test_iterators LIB_LIEF)
 
+find_program(MELKOR_FOUND melkor REQUIRED)
+
 add_test(test_iterators
          ${CMAKE_CURRENT_BINARY_DIR}/test_iterators)
 
diff --git a/tests/test_iterators.cpp b/tests/test_iterators.cpp
index 2d837371..df3d2ed5 100644
--- a/tests/test_iterators.cpp
+++ b/tests/test_iterators.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <LIEF/iterators.hpp>
 

base-commit: 2d9855fc7f9d4ce6325245f8b75c98eb7663db60
-- 
2.41.0