Skip to content

Commit 6beadc9

Browse files
authored
Merge pull request #48649 from Dr15Jones/UtilitiesCatch2
Convert FWCore/Utilities test to catch2
2 parents 74bbd44 + 4a02955 commit 6beadc9

30 files changed

+1326
-1682
lines changed

FWCore/Utilities/test/BuildFile.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<flags NO_TESTRUN="1"/>
88
</bin>
99

10-
<bin file="HRTime_t.cpp">
11-
<use name="cppunit"/>
10+
<bin file="test_catch2HRTime.cc,test_catch2_main.cc" name="testFWCoreUtilitiesHRTime">
11+
<use name="catch2"/>
1212
</bin>
1313

14-
<bin name="testFWCoreUtilities" file="typeidbase_t.cppunit.cpp,typeid_t.cppunit.cpp,cputimer_t.cppunit.cpp,esinputtag.cppunit.cpp,friendlyname_t.cppunit.cpp,signal_t.cppunit.cpp,soatuple_t.cppunit.cpp,transform.cppunit.cpp,callxnowait_t.cppunit.cpp,vecarray.cppunit.cpp,reusableobjectholder_t.cppunit.cpp,propagate_const_t.cppunit.cpp,propagate_const_array_t.cppunit.cpp,indexset.cppunit.cpp">
15-
<use name="cppunit"/>
14+
<bin file="test_catch2Slow_cputimer.cc,test_catch2_main.cc" name="testFWCoreUtilitiesCPUTimer">
15+
<use name="catch2"/>
1616
</bin>
1717

1818
<bin file="test_catch2_*.cc" name="testFWCoreUtilitiesCatch2">

FWCore/Utilities/test/HRTime_t.cpp

Lines changed: 0 additions & 78 deletions
This file was deleted.

FWCore/Utilities/test/callxnowait_t.cppunit.cpp

Lines changed: 0 additions & 117 deletions
This file was deleted.

FWCore/Utilities/test/cputimer_t.cppunit.cpp

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)