Update Catch2 to v3.4.0

Without upgrading Catch2, The following error occurs when building on Ubuntu 22.04 due to glibc: cucim/build-debug/_deps/deps-catch2-src/single_include/catch2/ catch.hpp:10830:58: error: call to non-‘constexpr’ function ‘long int sysconf(int)’ 10830 | static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ; Signed-off-by: Gigon Bae <gbae@nvidia.com>
gigony · Oct 27, 2023 · 238e0fc · 238e0fc
1 parent d489bb3
commit 238e0fc
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 35 deletions.
diff --git a/cpp/cmake/deps/catch2.cmake b/cpp/cmake/deps/catch2.cmake
@@ -17,7 +17,7 @@ if (NOT TARGET deps::catch2)
     FetchContent_Declare(
             deps-catch2
             GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-            GIT_TAG v2.13.1
+            GIT_TAG v3.4.0
             GIT_SHALLOW TRUE
     )
     FetchContent_GetProperties(deps-catch2)
@@ -29,8 +29,9 @@ if (NOT TARGET deps::catch2)
 
     add_subdirectory(${deps-catch2_SOURCE_DIR} ${deps-catch2_BINARY_DIR} EXCLUDE_FROM_ALL)
 
-    # Include Append catch2's cmake module path so that we can use `include(ParseAndAddCatchTests)`.
-    list(APPEND CMAKE_MODULE_PATH "${deps-catch2_SOURCE_DIR}/contrib")
+    # Include Append catch2's cmake module path so that we can use `include(Catch)`.
+    # https://github.com/catchorg/Catch2/blob/devel/docs/cmake-integration.md#catchcmake-and-catchaddtestscmake
+    list(APPEND CMAKE_MODULE_PATH "${deps-catch2_SOURCE_DIR}/extras")
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE)
 
     add_library(deps::catch2 INTERFACE IMPORTED GLOBAL)

diff --git a/cpp/plugins/cucim.kit.cumed/cmake/deps/catch2.cmake b/cpp/plugins/cucim.kit.cumed/cmake/deps/catch2.cmake
@@ -17,7 +17,7 @@ if (NOT TARGET deps::catch2)
     FetchContent_Declare(
             deps-catch2
             GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-            GIT_TAG v2.13.1
+            GIT_TAG v3.4.0
             GIT_SHALLOW TRUE
     )
     FetchContent_GetProperties(deps-catch2)
@@ -29,8 +29,9 @@ if (NOT TARGET deps::catch2)
 
     add_subdirectory(${deps-catch2_SOURCE_DIR} ${deps-catch2_BINARY_DIR} EXCLUDE_FROM_ALL)
 
-    # Include Append catch2's cmake module path so that we can use `include(ParseAndAddCatchTests)`.
-    list(APPEND CMAKE_MODULE_PATH "${deps-catch2_SOURCE_DIR}/contrib")
+    # Include Append catch2's cmake module path so that we can use `include(Catch)`.
+    # https://github.com/catchorg/Catch2/blob/devel/docs/cmake-integration.md#catchcmake-and-catchaddtestscmake
+    list(APPEND CMAKE_MODULE_PATH "${deps-catch2_SOURCE_DIR}/extras")
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE)
 
     add_library(deps::catch2 INTERFACE IMPORTED GLOBAL)

diff --git a/cpp/plugins/cucim.kit.cumed/tests/CMakeLists.txt b/cpp/plugins/cucim.kit.cumed/tests/CMakeLists.txt
@@ -57,6 +57,6 @@ target_include_directories(cumed_tests
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../src>
         )
 
-include(ParseAndAddCatchTests)
-# See https://github.com/catchorg/Catch2/blob/master/docs/cmake-integration.md#parseandaddcatchtestscmake for other options
-ParseAndAddCatchTests(cumed_tests)
+include(Catch)
+# See https://github.com/catchorg/Catch2/blob/devel/docs/cmake-integration.md#catchcmake-and-catchaddtestscmake for other options
+catch_discover_tests(cumed_tests)
diff --git a/cpp/plugins/cucim.kit.cumed/tests/main.cpp b/cpp/plugins/cucim.kit.cumed/tests/main.cpp
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-//#define CATCH_CONFIG_MAIN
-//#include <catch2/catch.hpp>
+// #define CATCH_CONFIG_MAIN
+// #include <catch2/catch_test_macros.hpp>
 
 // Implement main explicitly to handle additional parameters.
 #define CATCH_CONFIG_RUNNER
 #include "config.h"
 #include "cucim/core/framework.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_session.hpp>
 #include <string>
 #include <fmt/format.h>
 

diff --git a/cpp/plugins/cucim.kit.cumed/tests/test_basic.cpp b/cpp/plugins/cucim.kit.cumed/tests/test_basic.cpp
@@ -16,7 +16,7 @@
 
 #include "config.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <chrono>
 
 TEST_CASE("Verify file", "[test_basic.cpp]")

diff --git a/cpp/plugins/cucim.kit.cuslide/cmake/deps/catch2.cmake b/cpp/plugins/cucim.kit.cuslide/cmake/deps/catch2.cmake
@@ -17,7 +17,7 @@ if (NOT TARGET deps::catch2)
     FetchContent_Declare(
             deps-catch2
             GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-            GIT_TAG v2.13.1
+            GIT_TAG v3.4.0
             GIT_SHALLOW TRUE
     )
     FetchContent_GetProperties(deps-catch2)
@@ -29,8 +29,9 @@ if (NOT TARGET deps::catch2)
 
     add_subdirectory(${deps-catch2_SOURCE_DIR} ${deps-catch2_BINARY_DIR} EXCLUDE_FROM_ALL)
 
-    # Include Append catch2's cmake module path so that we can use `include(ParseAndAddCatchTests)`.
-    list(APPEND CMAKE_MODULE_PATH "${deps-catch2_SOURCE_DIR}/contrib")
+    # Include Append catch2's cmake module path so that we can use `include(Catch)`.
+    # https://github.com/catchorg/Catch2/blob/devel/docs/cmake-integration.md#catchcmake-and-catchaddtestscmake
+    list(APPEND CMAKE_MODULE_PATH "${deps-catch2_SOURCE_DIR}/extras")
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE)
 
     add_library(deps::catch2 INTERFACE IMPORTED GLOBAL)

diff --git a/cpp/plugins/cucim.kit.cuslide/tests/CMakeLists.txt b/cpp/plugins/cucim.kit.cuslide/tests/CMakeLists.txt
@@ -60,6 +60,6 @@ target_include_directories(cuslide_tests
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../src>
         )
 
-include(ParseAndAddCatchTests)
-# See https://github.com/catchorg/Catch2/blob/master/docs/cmake-integration.md#parseandaddcatchtestscmake for other options
-ParseAndAddCatchTests(cuslide_tests)
+include(Catch)
+# See https://github.com/catchorg/Catch2/blob/devel/docs/cmake-integration.md#catchcmake-and-catchaddtestscmake for other options
+catch_discover_tests(cuslide_tests)
diff --git a/cpp/plugins/cucim.kit.cuslide/tests/main.cpp b/cpp/plugins/cucim.kit.cuslide/tests/main.cpp
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-//#define CATCH_CONFIG_MAIN
-//#include <catch2/catch.hpp>
+// #define CATCH_CONFIG_MAIN
+// #include <catch2/catch_test_macros.hpp>
 
 // Implement main explicitly to handle additional parameters.
 #define CATCH_CONFIG_RUNNER
 #include "config.h"
 #include "cucim/core/framework.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_session.hpp>
 #include <string>
 #include <fmt/format.h>
 

diff --git a/cpp/plugins/cucim.kit.cuslide/tests/test_philips_tiff.cpp b/cpp/plugins/cucim.kit.cuslide/tests/test_philips_tiff.cpp
@@ -19,7 +19,7 @@
 #include "cuslide/tiff/tiff.h"
 #include "config.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <chrono>
 
 TEST_CASE("Verify philips tiff file", "[test_philips_tiff.cpp]")

diff --git a/cpp/plugins/cucim.kit.cuslide/tests/test_read_rawtiff.cpp b/cpp/plugins/cucim.kit.cuslide/tests/test_read_rawtiff.cpp
@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include <cuda_runtime.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <fmt/format.h>
 #include <cucim/filesystem/cufile_driver.h>
 #include <cstdlib>

diff --git a/cpp/plugins/cucim.kit.cuslide/tests/test_read_region.cpp b/cpp/plugins/cucim.kit.cuslide/tests/test_read_region.cpp
@@ -16,7 +16,8 @@
 
 #include <chrono>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <openslide/openslide.h>
 
 #include <cucim/memory/memory_manager.h>

diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
@@ -60,6 +60,6 @@ target_link_libraries(cucim_tests
             Threads::Threads # -lpthread
         )
 
-include(ParseAndAddCatchTests)
-# See https://github.com/catchorg/Catch2/blob/master/docs/cmake-integration.md#parseandaddcatchtestscmake for other options
-ParseAndAddCatchTests(cucim_tests)
+include(Catch)
+# See https://github.com/catchorg/Catch2/blob/devel/docs/cmake-integration.md#catchcmake-and-catchaddtestscmake for other options
+catch_discover_tests(cucim_tests)
diff --git a/cpp/tests/main.cpp b/cpp/tests/main.cpp
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-//#define CATCH_CONFIG_MAIN
-//#include <catch2/catch.hpp>
+// #define CATCH_CONFIG_MAIN
+// #include <catch2/catch_test_macros.hpp>
 
 // Implement main explicitly to handle additional parameters.
 #define CATCH_CONFIG_RUNNER
 #include "config.h"
 #include "cucim/core/framework.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_session.hpp>
 #include <string>
 #include <fmt/format.h>
 

diff --git a/cpp/tests/test_cufile.cpp b/cpp/tests/test_cufile.cpp
@@ -17,7 +17,7 @@
 #include "cucim/logger/timer.h"
 #include "config.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <fmt/format.h>
 #include <cucim/filesystem/cufile_driver.h>
 #include <chrono>

diff --git a/cpp/tests/test_metadata.cpp b/cpp/tests/test_metadata.cpp
@@ -20,7 +20,7 @@
 #include "cucim/core/framework.h"
 #include "cucim/io/format/image_format.h"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <fmt/format.h>
 #include <chrono>
 #include <cstdlib>

diff --git a/cpp/tests/test_read_region.cpp b/cpp/tests/test_read_region.cpp
@@ -17,7 +17,7 @@
 #include <chrono>
 #include <iostream>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <cuda_runtime.h>
 #include <openslide/openslide.h>
 

diff --git a/notebooks/File-access_Experiments_on_TIFF.ipynb b/notebooks/File-access_Experiments_on_TIFF.ipynb
@@ -199,7 +199,7 @@
     "#include \"cuslide/tiff/tiff.h\"\n",
     "#include \"config.h\"\n",
     "\n",
-    "#include <catch2/catch.hpp>\n",
+    "#include <catch2/catch_test_macros.hpp>\n",
     "#include <fmt/format.h>\n",
     "#include <cucim/filesystem/cufile_driver.h>\n",
     "#include <cstdlib>\n",