cms-sw · cmsbuild · Oct 14, 2025 · Oct 9, 2025
diff --git a/Alignment/HIPAlignmentAlgorithm/test/testHIPAnalyzers.cc b/Alignment/HIPAlignmentAlgorithm/test/testHIPAnalyzers.cc
@@ -5,7 +5,7 @@
 #include <format>
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // Function to run the catch2 tests
 //___________________________________________________________________________________________

diff --git a/Alignment/OfflineValidation/test/testTrackAnalyzers.cc b/Alignment/OfflineValidation/test/testTrackAnalyzers.cc
@@ -6,7 +6,7 @@
 
 #include <format>
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // Function to run the catch2 tests
 //___________________________________________________________________________________________

diff --git a/CUDADataFormats/Common/test/test_Product.cc b/CUDADataFormats/Common/test/test_Product.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "CUDADataFormats/Common/interface/Product.h"
 #include "HeterogeneousCore/CUDACore/interface/ScopedContext.h"

diff --git a/CUDADataFormats/Common/test/test_main.cc b/CUDADataFormats/Common/test/test_main.cc
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
diff --git a/CalibFormats/SiStripObjects/test/test_catch2_SiStripHashedDetId.cc b/CalibFormats/SiStripObjects/test/test_catch2_SiStripHashedDetId.cc
@@ -2,7 +2,7 @@
 #include "CalibFormats/SiStripObjects/interface/SiStripDetInfo.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include <set>
 #include <vector>

diff --git a/CalibFormats/SiStripObjects/test/test_catch2_main.cc b/CalibFormats/SiStripObjects/test/test_catch2_main.cc
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
diff --git a/CalibTracker/SiPixelESProducers/test/test_catch2_ESSources.cc b/CalibTracker/SiPixelESProducers/test/test_catch2_ESSources.cc
@@ -4,7 +4,7 @@
 #include <format>
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // Function to run the catch2 tests
 //___________________________________________________________________________________________

diff --git a/CommonTools/BaseParticlePropagator/test/makeMuon_catch2.cc b/CommonTools/BaseParticlePropagator/test/makeMuon_catch2.cc
@@ -2,7 +2,7 @@
 #include "CommonTools/BaseParticlePropagator/interface/RawParticle.h"
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 static constexpr const double kMuonMass = 0.10566;
 

diff --git a/CondCore/CondHDF5ESSource/test/test_catch2_convertSyncValue.cc b/CondCore/CondHDF5ESSource/test/test_catch2_convertSyncValue.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "CondCore/CondHDF5ESSource/plugins/convertSyncValue.h"
 
 using namespace cond::hdf5;

diff --git a/CondCore/CondHDF5ESSource/test/test_catch2_findMatchFirst.cc b/CondCore/CondHDF5ESSource/test/test_catch2_findMatchFirst.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "CondCore/CondHDF5ESSource/plugins/IOVSyncValue.h"
 //can't link to plugin so must include source
 #include "CondCore/CondHDF5ESSource/plugins/IOVSyncValue.cc"

diff --git a/CondCore/CondHDF5ESSource/test/test_catch2_h5cpp.cc b/CondCore/CondHDF5ESSource/test/test_catch2_h5cpp.cc
@@ -12,7 +12,7 @@
 
 // system include files
 #include <cassert>
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // user include files
 #include "FWCore/Utilities/interface/FileInPath.h"

diff --git a/CondCore/CondHDF5ESSource/test/test_catch2_main.cc b/CondCore/CondHDF5ESSource/test/test_catch2_main.cc
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
diff --git a/CondFormats/EcalObjects/test/EcalPulseSymmCovariance_catch2.cc b/CondFormats/EcalObjects/test/EcalPulseSymmCovariance_catch2.cc
@@ -1,7 +1,7 @@
 #include "CondFormats/EcalObjects/interface/EcalPulseSymmCovariances.h"
 
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include <iostream>
 
 TEST_CASE("EcalPulseSymmCovariance testing", "[EcalPulseSymmCovariance]") {

diff --git a/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc b/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc
@@ -11,7 +11,7 @@
 //
 
 // system include files
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // user include files
 #include "CondFormats/SerializationHelper/interface/SerializationHelper.h"

diff --git a/CondFormats/SerializationHelper/test/test_catch2_main.cc b/CondFormats/SerializationHelper/test/test_catch2_main.cc
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
diff --git a/CondFormats/SerializationHelper/test/test_catch2_unique_void_ptr.cc b/CondFormats/SerializationHelper/test/test_catch2_unique_void_ptr.cc
@@ -10,7 +10,7 @@
 //         Created:  Wed, 31 May 2023 15:24:23 GMT
 //
 
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "CondFormats/SerializationHelper/interface/unique_void_ptr.h"
 
 using namespace cond::serialization;

diff --git a/CondFormats/SiStripObjects/test/test_catch2_SiStripBadStripForPhase2.cpp b/CondFormats/SiStripObjects/test/test_catch2_SiStripBadStripForPhase2.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include <iostream>
 #include <iomanip>  // std::setw
 #include "CondFormats/SiStripObjects/interface/SiStripBadStrip.h"

diff --git a/CondFormats/SiStripObjects/test/test_catch2_SiStripLatency.cpp b/CondFormats/SiStripObjects/test/test_catch2_SiStripLatency.cpp
@@ -1,5 +1,5 @@
 #include <sstream>
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include <iostream>
 #include <iomanip>  // std::setw
 

diff --git a/CondFormats/SiStripObjects/test/test_catch2_main.cpp b/CondFormats/SiStripObjects/test/test_catch2_main.cpp
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
diff --git a/CondTools/RunInfo/test/test_catch2_LHCInfoPerFillPopCon.cpp b/CondTools/RunInfo/test/test_catch2_LHCInfoPerFillPopCon.cpp
@@ -1,6 +1,6 @@
 #define CATCH_CONFIG_MAIN
 
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "CondTools/RunInfo/interface/LHCInfoPerFillPopConSourceHandler.h"
 #include "CondTools/RunInfo/interface/TestLHCInfoPerFillPopConSourceHandler.h"
@@ -336,7 +336,7 @@ TEST_CASE("LHCInfoPerFillPopConSourceHandler.getNewObjects fills IOVs correctly
 
   // Populate mock data
   std::vector<unsigned short> fillNumbers = {1000};
-  std::vector<float> energies = {GENERATE(450.0, 6600.0, 8000.0)};
+  std::vector<float> energies = {GENERATE(450.0f, 6600.0f, 8000.0f)};
   std::vector<boost::posix_time::ptime> fillStartTimes = {boost::posix_time::time_from_string("2023-06-01 11:30:00")};
   std::vector<boost::posix_time::ptime> fillStableBeamBeginTimes = {
       boost::posix_time::time_from_string("2023-06-01 12:00:00")};
@@ -436,7 +436,7 @@ TEST_CASE(
 
   // Populate mock data
   std::vector<unsigned short> fillNumbers = {1000};
-  std::vector<float> energies = {GENERATE(-6800., -1., 0., 449.9, 8000.1)};  // invalid energy
+  std::vector<float> energies = {GENERATE(-6800.f, -1.f, 0.f, 449.9f, 8000.1f)};  // invalid energy
   std::vector<boost::posix_time::ptime> fillStartTimes = {boost::posix_time::time_from_string("2023-06-01 11:30:00")};
   std::vector<boost::posix_time::ptime> fillStableBeamBeginTimes = {
       boost::posix_time::time_from_string("2023-06-01 12:00:00")};

diff --git a/DQM/BeamMonitor/test/testAlcaBeamMonitor.cc b/DQM/BeamMonitor/test/testAlcaBeamMonitor.cc
@@ -1,7 +1,7 @@
 #include "FWCore/TestProcessor/interface/TestProcessor.h"
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 TEST_CASE("AlcaBeamMonitor tests", "[AlcaBeamMonitor]") {
   //The python configuration

diff --git a/DQM/EcalCommon/test/testEcalCommon.cc b/DQM/EcalCommon/test/testEcalCommon.cc
@@ -4,7 +4,7 @@
 #include <format>
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // Function to run the catch2 tests
 //___________________________________________________________________________________________

diff --git a/DQM/TrackerRemapper/test/test_catch2_Phase1PixelMaps.cc b/DQM/TrackerRemapper/test/test_catch2_Phase1PixelMaps.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include <iostream>
 #include <numeric>  // std::accumulate
 #include "TCanvas.h"

diff --git a/DQM/TrackerRemapper/test/test_catch2_Phase1PixelROCMaps.cc b/DQM/TrackerRemapper/test/test_catch2_Phase1PixelROCMaps.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include <iostream>
 #include <numeric>  // std::accumulate
 #include "TCanvas.h"

diff --git a/DQM/TrackerRemapper/test/test_catch2_Phase1PixelSummaryMap.cc b/DQM/TrackerRemapper/test/test_catch2_Phase1PixelSummaryMap.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include <iostream>
 #include <numeric>  // std::accumulate
 #include "TCanvas.h"

diff --git a/DQM/TrackerRemapper/test/test_catch2_SiStripTkMaps.cc b/DQM/TrackerRemapper/test/test_catch2_SiStripTkMaps.cc
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include <iostream>
 #include <numeric>  // std::accumulate
 #include "TCanvas.h"

diff --git a/DQM/TrackerRemapper/test/test_catch2_main.cc b/DQM/TrackerRemapper/test/test_catch2_main.cc
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
diff --git a/DQM/TrackingMonitorSource/test/testTrackingDQMAnalyzers.cc b/DQM/TrackingMonitorSource/test/testTrackingDQMAnalyzers.cc
@@ -5,7 +5,7 @@
 #include <format>
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // Function to run the catch2 tests
 //___________________________________________________________________________________________

diff --git a/DQMOffline/Trigger/test/EgHLTComCodes_catch2_test.cpp b/DQMOffline/Trigger/test/EgHLTComCodes_catch2_test.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "DQMOffline/Trigger/interface/EgHLTComCodes.h"
 #include "DQMOffline/Trigger/interface/EgHLTEgCutCodes.h"

diff --git a/DQMOffline/Trigger/test/EgHLTTrigCodes_catch2_test.cpp b/DQMOffline/Trigger/test/EgHLTTrigCodes_catch2_test.cpp
@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "DQMOffline/Trigger/interface/EgHLTTrigCodes.h"
 

diff --git a/DataFormats/Common/test/test_catch2_BoostRange.cpp b/DataFormats/Common/test/test_catch2_BoostRange.cpp
@@ -9,7 +9,7 @@
 #include <cassert>
 #include <iostream>
 #include <vector>
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 struct Dummy {
   Dummy() : id() {}

diff --git a/DataFormats/Common/test/test_catch2_DataFrame.cpp b/DataFormats/Common/test/test_catch2_DataFrame.cpp
@@ -4,7 +4,7 @@
 #include <numeric>
 #include <cstring>
 #include <random>
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "DataFormats/Common/interface/DataFrame.h"
 #include "DataFormats/Common/interface/DataFrameContainer.h"
 

diff --git a/DataFormats/Common/test/test_catch2_DetSetNew.cpp b/DataFormats/Common/test/test_catch2_DetSetNew.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "DataFormats/Common/interface/DetSetNew.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
@@ -207,7 +207,7 @@ TEST_CASE("DetSetNew", "[DetSetNew]") {
 
     // test error conditions
     REQUIRE_THROWS_MATCHES(
-        detsets.insert(22, 6), edm::Exception, Catch::Predicate<edm::Exception>([](edm::Exception const &e) {
+        detsets.insert(22, 6), edm::Exception, Catch::Matchers::Predicate<edm::Exception>([](edm::Exception const &e) {
           return e.categoryCode() == edm::errors::InvalidReference;
         }));
   }
@@ -307,7 +307,7 @@ TEST_CASE("DetSetNew", "[DetSetNew]") {
 
     // test error conditions
     REQUIRE_THROWS_MATCHES(
-        FF(detsets, 22), edm::Exception, Catch::Predicate<edm::Exception>([](edm::Exception const &e) {
+        FF(detsets, 22), edm::Exception, Catch::Matchers::Predicate<edm::Exception>([](edm::Exception const &e) {
           return e.categoryCode() == edm::errors::InvalidReference;
         }));
     REQUIRE_THROWS_MATCHES(
@@ -316,7 +316,7 @@ TEST_CASE("DetSetNew", "[DetSetNew]") {
           FF ff2(d, 45);
         }(detsets),
         edm::Exception,
-        Catch::Predicate<edm::Exception>(
+        Catch::Matchers::Predicate<edm::Exception>(
             [](edm::Exception const &e) { return e.categoryCode() == edm::errors::LogicError; }));
   }
 
@@ -378,7 +378,7 @@ TEST_CASE("DetSetNew", "[DetSetNew]") {
     }
     SECTION("error conditions") {
       REQUIRE_THROWS_MATCHES(
-          TSFF(detsets, 22), edm::Exception, Catch::Predicate<edm::Exception>([](edm::Exception const &e) {
+          TSFF(detsets, 22), edm::Exception, Catch::Matchers::Predicate<edm::Exception>([](edm::Exception const &e) {
             return e.categoryCode() == edm::errors::InvalidReference;
           }));
       REQUIRE_THROWS_MATCHES(
@@ -387,7 +387,7 @@ TEST_CASE("DetSetNew", "[DetSetNew]") {
             TSFF ff2(d, 45);
           }(detsets),
           edm::Exception,
-          Catch::Predicate<edm::Exception>(
+          Catch::Matchers::Predicate<edm::Exception>(
               [](edm::Exception const &e) { return e.categoryCode() == edm::errors::LogicError; }));
     }
   }
@@ -439,9 +439,10 @@ TEST_CASE("DetSetNew", "[DetSetNew]") {
       REQUIRE(p == detsets.end());
     }
     SECTION("invalid index") {
-      REQUIRE_THROWS_MATCHES(detsets[44], edm::Exception, Catch::Predicate<edm::Exception>([](edm::Exception const &e) {
-                               return e.categoryCode() == edm::errors::InvalidReference;
-                             }));
+      REQUIRE_THROWS_MATCHES(
+          detsets[44], edm::Exception, Catch::Matchers::Predicate<edm::Exception>([](edm::Exception const &e) {
+            return e.categoryCode() == edm::errors::InvalidReference;
+          }));
     }
   }
 
@@ -535,9 +536,10 @@ TEST_CASE("DetSetNew", "[DetSetNew]") {
     }
 
     SECTION("invalid index") {
-      REQUIRE_THROWS_MATCHES(detsets[22], edm::Exception, Catch::Predicate<edm::Exception>([](edm::Exception const &e) {
-                               return e.categoryCode() == edm::errors::InvalidReference;
-                             }));
+      REQUIRE_THROWS_MATCHES(
+          detsets[22], edm::Exception, Catch::Matchers::Predicate<edm::Exception>([](edm::Exception const &e) {
+            return e.categoryCode() == edm::errors::InvalidReference;
+          }));
     }
     DSTV detsets2;
     detsets2.swap(detsets);

diff --git a/DataFormats/Common/test/test_catch2_DetSetNewTS.cpp b/DataFormats/Common/test/test_catch2_DetSetNewTS.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "DataFormats/Common/interface/DetSetNew.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"

diff --git a/DataFormats/Common/test/test_catch2_DetSetVector.cpp b/DataFormats/Common/test/test_catch2_DetSetVector.cpp
@@ -2,7 +2,7 @@
  *  CMSSW
  */
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/Common/interface/Ref.h"

diff --git a/DataFormats/Common/test/test_catch2_DetSetVectorWithKey_t.cpp b/DataFormats/Common/test/test_catch2_DetSetVectorWithKey_t.cpp
@@ -5,7 +5,7 @@
 #include <stdexcept>
 #include <vector>
 
-#include <catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/Common/interface/Ref.h"

diff --git a/DataFormats/Common/test/test_catch2_DictionaryTools.cpp b/DataFormats/Common/test/test_catch2_DictionaryTools.cpp
@@ -4,7 +4,7 @@
 #include "FWCore/Utilities/interface/TypeDemangler.h"
 #include "FWCore/Utilities/interface/TypeID.h"
 #include "FWCore/Reflection/interface/TypeWithDict.h"
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include <typeinfo>
 #include <map>
 #include <vector>

diff --git a/DataFormats/Common/test/test_catch2_MapOfVectors.cpp b/DataFormats/Common/test/test_catch2_MapOfVectors.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 #include <algorithm>
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "DataFormats/Common/interface/MapOfVectors.h"
 
 typedef edm::MapOfVectors<int, int> MII;

diff --git a/DataFormats/Common/test/test_catch2_MultiSpan.cpp b/DataFormats/Common/test/test_catch2_MultiSpan.cpp
@@ -3,7 +3,7 @@
 #include <cmath>
 #include <numeric>
 #include <vector>
-#include <catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include "DataFormats/Common/interface/MultiSpan.h"
 

diff --git a/DataFormats/Common/test/test_catch2_OwnVector.cpp b/DataFormats/Common/test/test_catch2_OwnVector.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
 #include <cassert>
 #include <memory>
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "DataFormats/Common/interface/OwnVector.h"
 #include "FWCore/Utilities/interface/propagate_const.h"

diff --git a/DataFormats/Common/test/test_catch2_Ref.cpp b/DataFormats/Common/test/test_catch2_Ref.cpp
@@ -3,7 +3,7 @@
 #include "DataFormats/Common/interface/EDProductGetter.h"
 #include "DataFormats/Common/interface/Ref.h"
 #include "FWCore/Utilities/interface/EDMException.h"
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include <iostream>
 #include <string>

diff --git a/DataFormats/Common/test/test_catch2_RefCore.cpp b/DataFormats/Common/test/test_catch2_RefCore.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "DataFormats/Common/interface/RefCore.h"
 #include "DataFormats/Common/interface/RefCoreWithIndex.h"