Merge pull request #328 from lanl/jmm/spack2-v3

update catch2 v2 to catch2 v3
lanl · Nov 30, 2023 · 6fe168d · 6fe168d
2 parents 34f2208 + 503724c
commit 6fe168d
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -352,9 +352,8 @@ if(SINGULARITY_BUILD_TESTS)
     FetchContent_Declare(
       Catch2
       GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-      # MAUNEYC: On my side, this version works. The ones pinned onto upstream
-      # codes do not like to play with clang and/or newer compilers.
-      GIT_TAG v2.13.7)
+      # or later is fine too
+      GIT_TAG v3.0.1)
     FetchContent_MakeAvailable(Catch2)
     list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/contrib)
   endif()

diff --git a/spack-repo/packages/singularity-eos/package.py b/spack-repo/packages/singularity-eos/package.py
@@ -65,7 +65,8 @@ class SingularityEos(CMakePackage, CudaPackage):
 
     # building/testing/docs
     depends_on("cmake@3.19:")
-    depends_on("catch2@2.13.7", when="+tests")
+    depends_on("catch2@3.0.1:", when="@main +tests")
+    depends_on("catch2@2.13.7", when="@:1.8.0 +tests")
     depends_on("python@3:", when="+python")
     depends_on("py-numpy", when="+python+tests")
     depends_on("py-pybind11@2.9.1:", when="+python")

diff --git a/spack-repo/packages/spiner/package.py b/spack-repo/packages/spiner/package.py
@@ -51,9 +51,12 @@ class Spiner(CMakePackage, CudaPackage):
 
     variant("python", default=False, description="Python, Numpy & Matplotlib Support")
 
+    variant("test", default=False, description="Build tests")
+
     depends_on("cmake@3.12:", when="@:1.5.1")
     depends_on("cmake@3.19:", when="@1.6.0:")
-    depends_on("catch2@2.13.4:2.13.9")
+    depends_on("catch2@3.0.1:", when="@main +test")
+    depends_on("catch2@2.13.4:2.13.9", when="@:1.6.2 +test")
     depends_on("ports-of-call@1.2.0:", when="@:1.5.1")
     depends_on("ports-of-call@1.5.1:", when="@1.6.0:")
     depends_on("ports-of-call@main", when="@main")

diff --git a/test/catch2_define.cpp b/test/catch2_define.cpp
@@ -12,14 +12,9 @@
 // publicly and display publicly, and to permit others to do so.
 //------------------------------------------------------------------------------
 
+#include <catch2/catch_session.hpp>
 #include <ports-of-call/portability.hpp>
 
-#ifndef CATCH_CONFIG_RUNNER
-#define CATCH_CONFIG_RUNNER
-#define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
-#endif
-
 int main(int argc, char *argv[]) {
 
 #ifdef PORTABILITY_STRATEGY_KOKKOS

diff --git a/test/eos_unit_test_helpers.hpp b/test/eos_unit_test_helpers.hpp
@@ -17,7 +17,7 @@
 
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 #include <cmath>
 #include <cstdio>

diff --git a/test/test_eos_gruneisen.cpp b/test/test_eos_gruneisen.cpp
@@ -19,7 +19,7 @@
 #include <limits>
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <singularity-eos/base/constants.hpp>
@@ -56,9 +56,7 @@ SCENARIO("Gruneisen EOS entropy is disabled", "[GruneisenEOS][Entropy]") {
     EOS host_eos = Gruneisen(C0, S1, S2, S3, Gamma0, b, rho0, T0, P0, Cv);
     EOS eos = host_eos.GetOnDevice();
     THEN("A call to the entropy should throw an exception") {
-      using Catch::Matchers::Contains;
-      auto msg_matcher = Contains("Entropy is not enabled");
-      REQUIRE_THROWS_WITH(eos.EntropyFromDensityTemperature(1.0, 1.0), msg_matcher);
+      REQUIRE_THROWS(eos.EntropyFromDensityTemperature(1.0, 1.0));
     }
   }
 }

diff --git a/test/test_eos_helmholtz.cpp b/test/test_eos_helmholtz.cpp
@@ -24,7 +24,7 @@
 
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <ports-of-call/portability.hpp>
@@ -34,7 +34,6 @@
 #include <singularity-eos/eos/eos.hpp>
 #include <test/eos_unit_test_helpers.hpp>
 
-using Catch::Matchers::WithinRel;
 using singularity::Helmholtz;
 const std::string filename = "../data/helmholtz/helm_table.dat";
 SCENARIO("Helmholtz equation of state - Table interpolation (tgiven)", "[HelmholtzEOS]") {

diff --git a/test/test_eos_ideal.cpp b/test/test_eos_ideal.cpp
@@ -28,7 +28,7 @@
 
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <test/eos_unit_test_helpers.hpp>

diff --git a/test/test_eos_modifiers.cpp b/test/test_eos_modifiers.cpp
@@ -22,7 +22,7 @@
 
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <test/eos_unit_test_helpers.hpp>

diff --git a/test/test_eos_noble_abel.cpp b/test/test_eos_noble_abel.cpp
@@ -19,7 +19,7 @@
 #include <limits>
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <singularity-eos/base/constants.hpp>

diff --git a/test/test_eos_sap_polynomial.cpp b/test/test_eos_sap_polynomial.cpp
@@ -19,7 +19,7 @@
 #include <limits>
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <singularity-eos/base/constants.hpp>

diff --git a/test/test_eos_stellar_collapse.cpp b/test/test_eos_stellar_collapse.cpp
@@ -30,7 +30,7 @@
 
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <test/eos_unit_test_helpers.hpp>

diff --git a/test/test_eos_stiff.cpp b/test/test_eos_stiff.cpp
@@ -18,7 +18,7 @@
 #include <cstdlib>
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <singularity-eos/base/constants.hpp>

diff --git a/test/test_eos_tabulated.cpp b/test/test_eos_tabulated.cpp
@@ -29,7 +29,7 @@
 
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <test/eos_unit_test_helpers.hpp>

diff --git a/test/test_eos_vector.cpp b/test/test_eos_vector.cpp
@@ -21,7 +21,7 @@
 
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <test/eos_unit_test_helpers.hpp>

diff --git a/test/test_eos_vinet.cpp b/test/test_eos_vinet.cpp
@@ -18,7 +18,7 @@
 #include <cstdlib>
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <ports-of-call/portability.hpp>

diff --git a/test/test_math_utils.cpp b/test/test_math_utils.cpp
@@ -23,7 +23,7 @@
 
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 #include <test/eos_unit_test_helpers.hpp>

diff --git a/test/test_variadic_utils.cpp b/test/test_variadic_utils.cpp
@@ -19,7 +19,7 @@
 
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch2/catch.hpp"
+#include <catch2/catch_test_macros.hpp>
 #endif
 
 using singularity::Gruneisen;