Revert "update catch2 v2 to catch2 v3"

This reverts commit 132b17c.
lanl · Nov 30, 2023 · 90d5044 · 90d5044
1 parent 132b17c
commit 90d5044
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/spack-repo/packages/spiner/package.py b/spack-repo/packages/spiner/package.py
@@ -53,8 +53,7 @@ class Spiner(CMakePackage, CudaPackage):
 
     depends_on("cmake@3.12:", when="@:1.5.1")
     depends_on("cmake@3.19:", when="@1.6.0:")
-    depends_on("catch2@v3.0.1:")
-    depends_on("catch2@2.13.4:2.13.9", when="@:1.6.2")
+    depends_on("catch2@2.13.4:2.13.9")
     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/CMakeLists.txt b/test/CMakeLists.txt
@@ -12,8 +12,7 @@
 
 spiner_content_declare(Catch2
   GIT_REPO       https://github.com/catchorg/Catch2.git
-  GIT_TAG        v3.0.1 # or any later release
-  EXPECTED_TARGETS Catch2::Catch2
+  GIT_TAG        v2.13.7
   NAMESPACE spinerTest
 )
 

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