Merge pull request #267 from pinotree/system-catch2

arximboldi · web-flow · commit b60403ca8302 · 2023-08-02T12:03:05.000+02:00
Use Catch2 as installed
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -139,6 +139,8 @@ endif()
 if (immer_BUILD_TESTS)
   enable_testing()
 
+  find_package(Catch2 REQUIRED)
+
   add_custom_target(check
     COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/default.nix b/default.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   dontBuild = true;
   dontUseCmakeBuildDir = true;
+  cmakeFlags = [
+    "-Dimmer_BUILD_TESTS=OFF"
+    "-Dimmer_BUILD_EXAMPLES=OFF"
+  ];
   meta = {
     homepage    = "https://github.com/arximboldi/immer";
     description = "Postmodern immutable data structures for C++";
diff --git a/shell.nix b/shell.nix
@@ -49,6 +49,7 @@ tc.stdenv.mkDerivation rec {
   buildInputs = [
     tc.cc
     git
+    catch2
     cmake
     pkgconfig
     ninja
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -17,6 +17,6 @@ foreach(_file IN LISTS immer_unit_tests)
   target_compile_definitions(${_target} PUBLIC
     -DIMMER_OSS_FUZZ_DATA_PATH="${CMAKE_CURRENT_SOURCE_DIR}/oss-fuzz/data"
     CATCH_CONFIG_MAIN)
-  target_link_libraries(${_target} PUBLIC immer-dev)
+  target_link_libraries(${_target} PUBLIC immer-dev Catch2::Catch2)
   add_test("test/${_output}" ${_output})
 endforeach()
diff --git a/test/algorithm.cpp b/test/algorithm.cpp
@@ -7,7 +7,7 @@
 
 #include <immer/algorithm.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 struct thing
 {
diff --git a/test/atom/generic.ipp b/test/atom/generic.ipp
@@ -10,7 +10,7 @@
 #error "define the box template to use in ATOM_T"
 #endif
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 template <typename T>
 using BOX_T = typename ATOM_T<T>::box_type;
diff --git a/test/box/generic.ipp b/test/box/generic.ipp
@@ -10,7 +10,7 @@
 #error "define the box template to use in BOX_T"
 #endif
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 TEST_CASE("construction and copy")
 {
diff --git a/test/box/recursive.cpp b/test/box/recursive.cpp
@@ -13,7 +13,7 @@
 #include <immer/set.hpp>
 #include <immer/vector.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 struct rec_vec
 {
diff --git a/test/box/vector-of-boxes-transient.cpp b/test/box/vector-of-boxes-transient.cpp
@@ -10,7 +10,7 @@
 #include <immer/vector.hpp>
 #include <immer/vector_transient.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 TEST_CASE("issue-33")
 {
diff --git a/test/detail/type_traits.cpp b/test/detail/type_traits.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <forward_list>
 #include <immer/detail/type_traits.hpp>
 #include <list>
diff --git a/test/experimental/dvektor.cpp b/test/experimental/dvektor.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 #include <iostream>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using namespace immer;
 
diff --git a/test/flex_vector/fuzzed-0.cpp b/test/flex_vector/fuzzed-0.cpp
@@ -8,7 +8,7 @@
 
 #include "extra/fuzzer/fuzzer_input.hpp"
 #include <array>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <immer/flex_vector.hpp>
 #include <iostream>
 
diff --git a/test/flex_vector/fuzzed-1.cpp b/test/flex_vector/fuzzed-1.cpp
@@ -8,7 +8,7 @@
 
 #include "extra/fuzzer/fuzzer_input.hpp"
 #include <array>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <immer/flex_vector.hpp>
 #include <iostream>
 
diff --git a/test/flex_vector/fuzzed-2.cpp b/test/flex_vector/fuzzed-2.cpp
@@ -8,7 +8,7 @@
 
 #include "extra/fuzzer/fuzzer_input.hpp"
 #include <array>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <immer/flex_vector.hpp>
 #include <iostream>
 
diff --git a/test/flex_vector/fuzzed-3.cpp b/test/flex_vector/fuzzed-3.cpp
@@ -8,7 +8,7 @@
 
 #include "extra/fuzzer/fuzzer_input.hpp"
 #include <array>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <immer/flex_vector.hpp>
 #include <iostream>
 
diff --git a/test/flex_vector/fuzzed-4.cpp b/test/flex_vector/fuzzed-4.cpp
@@ -8,7 +8,7 @@
 
 #include "extra/fuzzer/fuzzer_input.hpp"
 #include <array>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <immer/flex_vector.hpp>
 #include <immer/flex_vector_transient.hpp>
 #include <immer/heap/gc_heap.hpp>
diff --git a/test/flex_vector/generic.ipp b/test/flex_vector/generic.ipp
@@ -14,7 +14,7 @@
 
 #include <boost/range/adaptors.hpp>
 #include <boost/range/irange.hpp>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/test/flex_vector/issue-45.cpp b/test/flex_vector/issue-45.cpp
@@ -13,7 +13,7 @@
 #include <immer/vector.hpp>
 #include <immer/vector_transient.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #if IMMER_CXX_STANDARD >= 17
 
diff --git a/test/flex_vector_transient/generic.ipp b/test/flex_vector_transient/generic.ipp
@@ -14,7 +14,7 @@
 
 #include <boost/range/adaptors.hpp>
 #include <boost/range/irange.hpp>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/test/map/generic.ipp b/test/map/generic.ipp
@@ -18,7 +18,7 @@
 #include "test/dada.hpp"
 #include "test/util.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <random>
 #include <unordered_map>
diff --git a/test/map/issue-56.cpp b/test/map/issue-56.cpp
@@ -13,7 +13,7 @@
 #include <immer/map.hpp>
 #include <immer/vector.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 TEST_CASE("const map")
 {
diff --git a/test/map_transient/generic.ipp b/test/map_transient/generic.ipp
@@ -8,7 +8,7 @@
 
 #include "test/util.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #ifndef MAP_T
 #error "define the map template to use in MAP_T"
diff --git a/test/memory/heaps.cpp b/test/memory/heaps.cpp
@@ -12,7 +12,7 @@
 #include <immer/heap/malloc_heap.hpp>
 #include <immer/heap/thread_local_free_list_heap.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <numeric>
 
 void do_stuff_to(void* buf, std::size_t size)
diff --git a/test/memory/refcounts.cpp b/test/memory/refcounts.cpp
@@ -10,7 +10,7 @@
 #include <immer/refcount/refcount_policy.hpp>
 #include <immer/refcount/unsafe_refcount_policy.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 TEST_CASE("no refcount has no data")
 {
diff --git a/test/oss-fuzz/array-0.cpp b/test/oss-fuzz/array-0.cpp
@@ -10,7 +10,7 @@
 
 #include <immer/array.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 namespace {
 
diff --git a/test/oss-fuzz/array-gc-0.cpp b/test/oss-fuzz/array-gc-0.cpp
@@ -15,7 +15,7 @@
 #include <immer/heap/gc_heap.hpp>
 #include <immer/refcount/no_refcount_policy.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using gc_memory = immer::memory_policy<immer::heap_policy<immer::gc_heap>,
                                        immer::no_refcount_policy,
diff --git a/test/oss-fuzz/flex-vector-0.cpp b/test/oss-fuzz/flex-vector-0.cpp
@@ -12,7 +12,7 @@
 #include <immer/flex_vector.hpp>
 #include <immer/refcount/no_refcount_policy.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #define IMMER_FUZZED_TRACE_ENABLE 0
 
diff --git a/test/oss-fuzz/flex-vector-bo-0.cpp b/test/oss-fuzz/flex-vector-bo-0.cpp
@@ -12,7 +12,7 @@
 #include <immer/flex_vector.hpp>
 #include <immer/flex_vector_transient.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #define IMMER_FUZZED_TRACE_ENABLE 1
 
diff --git a/test/oss-fuzz/flex-vector-gc-0.cpp b/test/oss-fuzz/flex-vector-gc-0.cpp
@@ -13,7 +13,7 @@
 #include <immer/heap/gc_heap.hpp>
 #include <immer/refcount/no_refcount_policy.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #define IMMER_FUZZED_TRACE_ENABLE 0
 
diff --git a/test/oss-fuzz/map-gc-0.cpp b/test/oss-fuzz/map-gc-0.cpp
@@ -14,7 +14,7 @@
 #include <immer/map.hpp>
 #include <immer/refcount/no_refcount_policy.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using gc_memory = immer::memory_policy<immer::heap_policy<immer::gc_heap>,
                                        immer::no_refcount_policy,
diff --git a/test/oss-fuzz/map-st-0.cpp b/test/oss-fuzz/map-st-0.cpp
@@ -13,7 +13,7 @@
 #include <immer/heap/gc_heap.hpp>
 #include <immer/map.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using st_memory = immer::memory_policy<immer::heap_policy<immer::cpp_heap>,
                                        immer::unsafe_refcount_policy,
diff --git a/test/oss-fuzz/map-st-1.cpp b/test/oss-fuzz/map-st-1.cpp
@@ -14,7 +14,7 @@
 #include <immer/heap/gc_heap.hpp>
 #include <immer/map.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using st_memory = immer::memory_policy<immer::heap_policy<immer::cpp_heap>,
                                        immer::unsafe_refcount_policy,
diff --git a/test/oss-fuzz/map-st-2.cpp b/test/oss-fuzz/map-st-2.cpp
@@ -14,7 +14,7 @@
 #include <immer/heap/gc_heap.hpp>
 #include <immer/map.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #define IMMER_FUZZED_TRACE_ENABLE 0
 
diff --git a/test/oss-fuzz/map-st-str-0.cpp b/test/oss-fuzz/map-st-str-0.cpp
@@ -16,7 +16,7 @@
 
 #include <array>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #define IMMER_FUZZED_TRACE_ENABLE 1
 
diff --git a/test/oss-fuzz/set-gc-0.cpp b/test/oss-fuzz/set-gc-0.cpp
@@ -14,7 +14,7 @@
 #include <immer/refcount/no_refcount_policy.hpp>
 #include <immer/set.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using gc_memory = immer::memory_policy<immer::heap_policy<immer::gc_heap>,
                                        immer::no_refcount_policy,
diff --git a/test/oss-fuzz/set-gc-1.cpp b/test/oss-fuzz/set-gc-1.cpp
@@ -16,7 +16,7 @@
 
 #include <immer/algorithm.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #define IMMER_FUZZED_TRACE_ENABLE 0
 
diff --git a/test/oss-fuzz/set-st-0.cpp b/test/oss-fuzz/set-st-0.cpp
@@ -16,7 +16,7 @@
 
 #include <array>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 using st_memory = immer::memory_policy<immer::heap_policy<immer::cpp_heap>,
                                        immer::unsafe_refcount_policy,
diff --git a/test/oss-fuzz/set-st-str-0.cpp b/test/oss-fuzz/set-st-str-0.cpp
@@ -16,7 +16,7 @@
 
 #include <array>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 namespace {
 
diff --git a/test/set/generic.ipp b/test/set/generic.ipp
@@ -18,7 +18,7 @@
 #include <immer/algorithm.hpp>
 #include <immer/box.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <random>
 #include <unordered_set>
diff --git a/test/set_transient/generic.ipp b/test/set_transient/generic.ipp
@@ -8,7 +8,7 @@
 
 #include "test/util.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #ifndef SET_T
 #error "define the set template to use in SET_T"
diff --git a/test/table/generic.ipp b/test/table/generic.ipp
@@ -17,7 +17,7 @@
 #include "test/dada.hpp"
 #include "test/util.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <random>
 #include <unordered_map>
diff --git a/test/table_transient/generic.ipp b/test/table_transient/generic.ipp
@@ -8,7 +8,7 @@
 
 #include "test/util.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #ifndef SETUP_T
 #error "define the table types via SETUP_T macro"
diff --git a/test/vector/generic.ipp b/test/vector/generic.ipp
@@ -12,7 +12,7 @@
 #include <immer/algorithm.hpp>
 
 #include <boost/range/adaptors.hpp>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <algorithm>
 #include <numeric>
diff --git a/test/vector/issue-177.cpp b/test/vector/issue-177.cpp
@@ -13,7 +13,7 @@
 #include <immer/vector.hpp>
 #include <immer/vector_transient.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 struct object;
 
diff --git a/test/vector/issue-46.cpp b/test/vector/issue-46.cpp
diff --git a/test/vector_transient/generic.ipp b/test/vector_transient/generic.ipp
diff --git a/tools/include/catch.hpp b/tools/include/catch.hpp

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`#include <immer/algorithm.hpp>`
`9`	`9`
`10`		`-#include <catch.hpp>`
	`10`	`+#include <catch2/catch.hpp>`
`11`	`11`
`12`	`12`	`struct thing`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#error "define the box template to use in BOX_T"`
`11`	`11`	`#endif`
`12`	`12`
`13`		`-#include <catch.hpp>`
	`13`	`+#include <catch2/catch.hpp>`
`14`	`14`
`15`	`15`	`TEST_CASE("construction and copy")`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#include <immer/set.hpp>`
`14`	`14`	`#include <immer/vector.hpp>`
`15`	`15`
`16`		`-#include <catch.hpp>`
	`16`	`+#include <catch2/catch.hpp>`
`17`	`17`
`18`	`18`	`struct rec_vec`
`19`	`19`	`{`