Merge pull request #83 from lanl/jmm/catch2-v3

update spack2 v2 to spack2 v3

.gitlab-ci.yml

@@ -9,7 +9,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   SPINER_GCC_VERSION: "9.3.0"
   SPINER_CUDA_VERSION: "11.6.0"
-  SPINER_SPACK_SPEC: "spiner@main+python%gcc@${SPINER_GCC_VERSION}"
+  SPINER_SPACK_SPEC: "spiner@main+python+test%gcc@${SPINER_GCC_VERSION}"
   COLOR_CYAN: "\e[1;36m"
   COLOR_PLAIN: "\e[0m"
   # set to different spack upstream for testing

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("[email protected]:", when="@:1.5.1")
     depends_on("[email protected]:", when="@1.6.0:")
-    depends_on("[email protected]:2.13.9")
+    depends_on("[email protected]:", when="@main +test")
+    depends_on("[email protected]:2.13.9", when="@:1.6.2 +test")
     depends_on("[email protected]:", when="@:1.5.1")
     depends_on("[email protected]:", when="@1.6.0:")
     depends_on("ports-of-call@main", when="@main")

test/CMakeLists.txt

@@ -12,7 +12,8 @@
 
 spiner_content_declare(Catch2
   GIT_REPO       https://github.com/catchorg/Catch2.git
-  GIT_TAG        v2.13.7
+  GIT_TAG        v3.0.1 # or any later release
+  EXPECTED_TARGETS Catch2::Catch2
   NAMESPACE spinerTest
 )
 

test/test.cpp

@@ -29,8 +29,8 @@
 #include "hdf5_hl.h"
 #endif
 
-#define CATCH_CONFIG_RUNNER
-#include "catch2/catch.hpp"
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using DataBox = Spiner::DataBox<Real>;
 using Spiner::IndexType;