Merge pull request #49166 from iarspider/iarspider-patches-20251015-1

cmsbuild · web-flow · commit 37203fae505d · 2025-10-15T21:48:10.000+02:00
Migrate skeletons to catch2 v3 (follow-up on #49121)
diff --git a/FWCore/Skeletons/mkTemplates/EDAnalyzer/test_catch2_EDAnalyzer.cc b/FWCore/Skeletons/mkTemplates/EDAnalyzer/test_catch2_EDAnalyzer.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "FWCore/TestProcessor/interface/TestProcessor.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
diff --git a/FWCore/Skeletons/mkTemplates/EDAnalyzer/test_catch2_main.cc b/FWCore/Skeletons/mkTemplates/EDAnalyzer/test_catch2_main.cc
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
diff --git a/FWCore/Skeletons/mkTemplates/EDFilter/test_catch2_EDFilter.cc b/FWCore/Skeletons/mkTemplates/EDFilter/test_catch2_EDFilter.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "FWCore/TestProcessor/interface/TestProcessor.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
diff --git a/FWCore/Skeletons/mkTemplates/EDFilter/test_catch2_main.cc b/FWCore/Skeletons/mkTemplates/EDFilter/test_catch2_main.cc
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
diff --git a/FWCore/Skeletons/mkTemplates/EDProducer/test_catch2_EDProducer.cc b/FWCore/Skeletons/mkTemplates/EDProducer/test_catch2_EDProducer.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "FWCore/TestProcessor/interface/TestProcessor.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
diff --git a/FWCore/Skeletons/mkTemplates/EDProducer/test_catch2_main.cc b/FWCore/Skeletons/mkTemplates/EDProducer/test_catch2_main.cc
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
diff --git a/FWCore/TestProcessor/Readme.md b/FWCore/TestProcessor/Readme.md
@@ -167,7 +167,7 @@ int main() {
 ```cpp
 #include "FWCore/TestProcessor/interface/TestProcessor.h"
 ...
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 TEST_CASE("FooProd tests", "[FooProd]") {
   //The python configuration
diff --git a/PhysicsTools/TensorFlow/test/testBaseCUDA.h b/PhysicsTools/TensorFlow/test/testBaseCUDA.h
@@ -11,7 +11,7 @@
 #include <filesystem>
 #include <cppunit/extensions/HelperMacros.h>
 #include <stdexcept>
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "FWCore/AbstractServices/interface/ResourceInformation.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "catch.hpp"`
	`1`	`+#include "catch2/catch_all.hpp"`
`2`	`2`	`#include "FWCore/TestProcessor/interface/TestProcessor.h"`
`3`	`3`	`#include "FWCore/Utilities/interface/Exception.h"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#define CATCH_CONFIG_MAIN`
`2`		`-#include "catch.hpp"`
	`2`	`+#include "catch2/catch_all.hpp"`