Upgrade to Catch2 version 3

cisco · Dec 14, 2023 · 60b54a4 · 60b54a4
1 parent a700ffb
commit 60b54a4
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,7 +87,7 @@ endif ()
 if(TESTING)
   enable_testing()
 
-  find_package(Catch2 REQUIRED)
+  find_package(Catch2 3 REQUIRED)
 
   include(CTest)
   include(Catch)

diff --git a/alternatives/boringssl/vcpkg.json b/alternatives/boringssl/vcpkg.json
@@ -10,5 +10,11 @@
     "catch2",
     "nlohmann-json"
   ],
-  "builtin-baseline": "3b3bd424827a1f7f4813216f6b32b6c61e386b2e"
+  "builtin-baseline": "eb33d2f7583405fca184bcdf7fdd5828ec88ac05",
+  "overrides": [
+    {
+      "name": "catch2",
+      "version": "3.5.0"
+    }
+  ]
 }
diff --git a/alternatives/openssl_1.1/vcpkg.json b/alternatives/openssl_1.1/vcpkg.json
@@ -10,7 +10,7 @@
     "catch2",
     "nlohmann-json"
   ],
-  "builtin-baseline": "3b3bd424827a1f7f4813216f6b32b6c61e386b2e",
+  "builtin-baseline": "eb33d2f7583405fca184bcdf7fdd5828ec88ac05",
   "overrides": [
     {
       "name": "openssl",

diff --git a/alternatives/openssl_3/vcpkg.json b/alternatives/openssl_3/vcpkg.json
@@ -10,11 +10,15 @@
     "catch2",
     "nlohmann-json"
   ],
-  "builtin-baseline": "3b3bd424827a1f7f4813216f6b32b6c61e386b2e",
+  "builtin-baseline": "eb33d2f7583405fca184bcdf7fdd5828ec88ac05",
   "overrides": [
     {
       "name": "openssl",
       "version": "3.0.7"
+    },
+    {
+      "name": "catch2",
+      "version": "3.5.0"
     }
   ]
 }
diff --git a/lib/bytes/test/bytes.cpp b/lib/bytes/test/bytes.cpp
@@ -1,5 +1,5 @@
 #include <bytes/bytes.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <memory>
 #include <sstream>
 

diff --git a/lib/hpke/test/aead.cpp b/lib/hpke/test/aead.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/hpke.h>
 
 #include "common.h"

diff --git a/lib/hpke/test/base64.cpp b/lib/hpke/test/base64.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/base64.h>
 
 using namespace MLS_NAMESPACE::hpke;

diff --git a/lib/hpke/test/certificate.cpp b/lib/hpke/test/certificate.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/certificate.h>
 
 #include "common.h"

diff --git a/lib/hpke/test/common.cpp b/lib/hpke/test/common.cpp
@@ -2,7 +2,7 @@
 #include <set>
 #include <stdexcept>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <openssl/crypto.h>
 
 #if defined(WITH_OPENSSL3)

diff --git a/lib/hpke/test/hpke.cpp b/lib/hpke/test/hpke.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/hpke.h>
 #include <namespace.h>
 

diff --git a/lib/hpke/test/kdf.cpp b/lib/hpke/test/kdf.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/hpke.h>
 
 #include "common.h"

diff --git a/lib/hpke/test/kem.cpp b/lib/hpke/test/kem.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/hpke.h>
 
 #include "common.h"

diff --git a/lib/hpke/test/random.cpp b/lib/hpke/test/random.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/random.h>
 
 #include "common.h"

diff --git a/lib/hpke/test/signature.cpp b/lib/hpke/test/signature.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/signature.h>
 #include <nlohmann/json.hpp>
 

diff --git a/lib/hpke/test/userinfo_vc.cpp b/lib/hpke/test/userinfo_vc.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/userinfo_vc.h>
 #include <nlohmann/json.hpp>
 

diff --git a/lib/mls_vectors/test/mls_vectors.cpp b/lib/mls_vectors/test/mls_vectors.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mls_vectors/mls_vectors.h>
 #include <tls/tls_syntax.h>
 

diff --git a/lib/tls_syntax/test/tls_syntax.cpp b/lib/tls_syntax/test/tls_syntax.cpp
@@ -1,5 +1,5 @@
 #include <bytes/bytes.h>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <namespace.h>
 #include <tls/tls_syntax.h>
 

diff --git a/test/credential.cpp b/test/credential.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mls/credential.h>
 
 using namespace MLS_NAMESPACE;

diff --git a/test/crypto.cpp b/test/crypto.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mls/crypto.h>
 #include <mls_vectors/mls_vectors.h>
 #include <string>

diff --git a/test/grease.cpp b/test/grease.cpp
@@ -1,5 +1,5 @@
 #include "grease.h"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mls/core_types.h>
 #include <mls/messages.h>
 

diff --git a/test/key_schedule.cpp b/test/key_schedule.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mls/state.h>
 #include <mls_vectors/mls_vectors.h>
 

diff --git a/test/messages.cpp b/test/messages.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mls/messages.h>
 #include <mls/state.h>
 #include <mls_vectors/mls_vectors.h>

diff --git a/test/session.cpp b/test/session.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/random.h>
 #include <mls/session.h>
 

diff --git a/test/state.cpp b/test/state.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/random.h>
 #include <mls/common.h>
 #include <mls/state.h>

diff --git a/test/tree_math.cpp b/test/tree_math.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <mls_vectors/mls_vectors.h>
 
 #include <vector>

diff --git a/test/treekem.cpp b/test/treekem.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <hpke/random.h>
 #include <mls/common.h>
 #include <mls/treekem.h>

diff --git a/vcpkg b/vcpkg