From dda43b4fb0398ea8011fcc3c3211fccca0647c49 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Thu, 12 Dec 2019 10:14:22 +0100 Subject: [PATCH 1/8] CaloTPCnv: Cleanup of EXTRA_PATTERNS in unit tests Remove ignore patterns in unit tests that are either obsolete or handled by `post.sh` directly. --- Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt index f2019fb43fa..ead47c00cc7 100644 --- a/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt +++ b/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt @@ -84,6 +84,6 @@ atlas_add_test( CaloCompactCellTool_test LINK_LIBRARIES CaloDetDescrLib CaloEvent CaloIdentifier AthenaKernel StoreGateLib GaudiKernel LArRecEvent TileEvent TestTools IdDictParser CaloTPCnv - EXTRA_PATTERNS "SGAudSvc +INFO|^lar decode|^HistogramPersis.* INFO|initialize_from_dict|mask/zero|^JobOptionsSvc +INFO|^AtlasDetectorID::" + EXTRA_PATTERNS "SGAudSvc +INFO|^lar decode|initialize_from_dict|mask/zero|^AtlasDetectorID::" ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" ) -- GitLab From 8f787c75f168c30bd0da72cf95843bbe0561b01a Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Thu, 12 Dec 2019 10:14:23 +0100 Subject: [PATCH 2/8] CaloRec: Cleanup of EXTRA_PATTERNS in unit tests Remove ignore patterns in unit tests that are either obsolete or handled by `post.sh` directly. --- Calorimeter/CaloRec/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Calorimeter/CaloRec/CMakeLists.txt b/Calorimeter/CaloRec/CMakeLists.txt index fcb4935df12..aaf1bb34ee5 100644 --- a/Calorimeter/CaloRec/CMakeLists.txt +++ b/Calorimeter/CaloRec/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 793768 2017-01-25 03:44:30Z ssnyder $ ################################################################################ # Package: CaloRec ################################################################################ @@ -75,7 +74,7 @@ atlas_add_test( CaloCellFastCopyTool_test SOURCES test/CaloCellFastCopyTool_test.cxx LINK_LIBRARIES CaloRecLib CaloEvent CaloDetDescrLib CaloIdentifier IdDictParser AthenaBaseComps StoreGateLib CxxUtils GaudiKernel - EXTRA_PATTERNS "Retrieved const pointer|Retrieved const handle|Service base class initialized|DEBUG Property update for OutputLevel|object not modifiable" ) + EXTRA_PATTERNS "Retrieved const pointer|Retrieved const handle|object not modifiable" ) atlas_add_test( CaloCellContainerFromClusterTool_test SOURCES test/CaloCellContainerFromClusterTool_test.cxx -- GitLab From 356065359f445f727500263533947902df0f513b Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Thu, 12 Dec 2019 10:14:24 +0100 Subject: [PATCH 3/8] CaloUtils: Cleanup of EXTRA_PATTERNS in unit tests Remove ignore patterns in unit tests that are either obsolete or handled by `post.sh` directly. --- Calorimeter/CaloUtils/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Calorimeter/CaloUtils/CMakeLists.txt b/Calorimeter/CaloUtils/CMakeLists.txt index 06efe0a2c7b..8e17e56b3d9 100644 --- a/Calorimeter/CaloUtils/CMakeLists.txt +++ b/Calorimeter/CaloUtils/CMakeLists.txt @@ -62,7 +62,7 @@ atlas_add_test( CaloLayerCalculator_test INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDetDescrLib CaloEvent CaloIdentifier StoreGateLib xAODCaloEvent GaudiKernel TestTools IdDictParser CaloUtilsLib - EXTRA_PATTERNS "^lar decode|mask/zero|initialize_from_dict|^JobOptionsSvc +INFO|^ channel range|GP:==============|^AtlasDetectorID::" + EXTRA_PATTERNS "^lar decode|mask/zero|initialize_from_dict|^ channel range|^AtlasDetectorID::" ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" ) atlas_add_test( CaloVertexedCell_test @@ -70,7 +70,7 @@ atlas_add_test( CaloVertexedCell_test INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDetDescrLib CaloEvent CaloIdentifier StoreGateLib GaudiKernel TestTools IdDictParser CaloUtilsLib - EXTRA_PATTERNS "^lar decode|mask/zero|initialize_from_dict|^JobOptionsSvc +INFO|^ channel range|GP:==============|^AtlasDetectorID::" + EXTRA_PATTERNS "^lar decode|mask/zero|initialize_from_dict|^ channel range|^AtlasDetectorID::" ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" ) atlas_add_test( CaloVertexedCluster_test @@ -78,17 +78,17 @@ atlas_add_test( CaloVertexedCluster_test INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDetDescrLib CaloIdentifier StoreGateLib xAODCaloEvent GaudiKernel TestTools IdDictParser CaloUtilsLib - EXTRA_PATTERNS "^lar decode|mask/zero|initialize_from_dict|^JobOptionsSvc +INFO|^ channel range|GP:==============|^AtlasDetectorID::" + EXTRA_PATTERNS "^lar decode|mask/zero|initialize_from_dict|^ channel range|^AtlasDetectorID::" ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" ) atlas_add_test( CaloTowerStore_test SCRIPT test/CaloTowerStore_test.sh - EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConst.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|Cs Tube|XMLFileCatalog Info|IOVSvcTool|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager|^CORAL/" + EXTRA_PATTERNS "Reading file" PROPERTIES TIMEOUT 500 ) atlas_add_test( CaloTowerBuilderTool_test SCRIPT test/CaloTowerBuilderTool_test.sh - EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConstru.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|Cs Tube|XMLFileCatalog Info|IOVSvcTool|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager|oracle Info|initialize_from_dictionary|Calo Detector Manager" + EXTRA_PATTERNS "Reading file" ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-11" PROPERTIES TIMEOUT 500 ) -- GitLab From bdb947363fe02e91f8898e06937967959de9194c Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Thu, 12 Dec 2019 10:14:25 +0100 Subject: [PATCH 4/8] AthAllocators: Cleanup of EXTRA_PATTERNS in unit tests Remove ignore patterns in unit tests that are either obsolete or handled by `post.sh` directly. --- Control/AthAllocators/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Control/AthAllocators/CMakeLists.txt b/Control/AthAllocators/CMakeLists.txt index b075d220ca5..694974dd174 100644 --- a/Control/AthAllocators/CMakeLists.txt +++ b/Control/AthAllocators/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 782850 2016-11-07 21:11:58Z ssnyder $ ################################################################################ # Package: AthAllocators ################################################################################ @@ -59,5 +58,4 @@ _simple_test( LockedAllocator_test ) atlas_add_test( DataPool_test SOURCES test/DataPool_test.cxx LINK_LIBRARIES GaudiKernel TestTools AthAllocators - EXTRA_PATTERNS "^IncidentSvc +DEBUG Adding|^HistogramPersis.* (INFO|DEBUG)|^JobOptionsSvc +INFO|DEBUG Property update for OutputLevel" ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" ) -- GitLab From b41a453b5143b13ec790cf7e46d8f073593db43e Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Thu, 12 Dec 2019 10:14:26 +0100 Subject: [PATCH 5/8] AthLinks: Cleanup of EXTRA_PATTERNS in unit tests Remove ignore patterns in unit tests that are either obsolete or handled by `post.sh` directly. --- Control/AthLinks/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Control/AthLinks/CMakeLists.txt b/Control/AthLinks/CMakeLists.txt index 302a0e4245f..00722712564 100644 --- a/Control/AthLinks/CMakeLists.txt +++ b/Control/AthLinks/CMakeLists.txt @@ -127,7 +127,4 @@ atlas_add_test( AssociationMap_test SOURCES test/AssociationMap_test.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks - EXTRA_PATTERNS "ClassIDSvc Initialized successfully|^HistogramPersis.* INFO" ) - - + LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils SGTools GaudiKernel TestTools AthLinks ) -- GitLab From 04d69534f62a38cf895ffd09f518b1ce7fc6bacf Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Thu, 12 Dec 2019 10:14:27 +0100 Subject: [PATCH 6/8] CLIDComps: Cleanup of EXTRA_PATTERNS in unit tests Remove ignore patterns in unit tests that are either obsolete or handled by `post.sh` directly. --- Control/CLIDComps/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Control/CLIDComps/CMakeLists.txt b/Control/CLIDComps/CMakeLists.txt index fdf7cb651ec..dbe7165024a 100644 --- a/Control/CLIDComps/CMakeLists.txt +++ b/Control/CLIDComps/CMakeLists.txt @@ -35,7 +35,6 @@ endif() atlas_add_test( ClassIDSvc_test SOURCES test/ClassIDSvc_test.cxx LINK_LIBRARIES AthenaKernel GaudiKernel TestTools - EXTRA_PATTERNS "WARNING Could not resolve clid DB|^JobOptionsSvc +INFO|DEBUG Property update for OutputLevel" ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" ) atlas_add_test( clid -- GitLab From 83d60142b4befcfd7ee67df5c9c407ebfd4eb391 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Thu, 12 Dec 2019 10:14:28 +0100 Subject: [PATCH 7/8] LArRecUtils: Cleanup of EXTRA_PATTERNS in unit tests Remove ignore patterns in unit tests that are either obsolete or handled by `post.sh` directly. --- LArCalorimeter/LArRecUtils/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/LArCalorimeter/LArRecUtils/CMakeLists.txt b/LArCalorimeter/LArRecUtils/CMakeLists.txt index 663edd64359..6eaea281eb1 100644 --- a/LArCalorimeter/LArRecUtils/CMakeLists.txt +++ b/LArCalorimeter/LArRecUtils/CMakeLists.txt @@ -69,9 +69,8 @@ atlas_install_joboptions( share/*.py ) atlas_add_test( LArFCalTowerBuilderTool SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/LArFCalTowerBuilderTool_test.sh - PROPERTIES TIMEOUT 600 - EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConstru.*INFO|^GeoModelSvc +INFO|U-shape parameter|Cs Tube parameter|XMLFileCatalog Info|No IOVSvcTool associated|^RalSessionMgr Info|RDBMS technology|^AthenaRootStre.* INFO|^GUID: Class pool::DbString has GUID|INFO TileDddbManager|^HGTD_ID *INFO|Unable to locate catalog|^CORAL/|TFile::Init|MetaDataSvc" - ) + EXTRA_PATTERNS "Reading file" + PROPERTIES TIMEOUT 600 ) atlas_add_test( LArRecUtilsConfig_test SCRIPT python -m LArRecUtils.LArRecUtilsConfig -- GitLab From 5b3f604b3f0e0bbb3404a4870ae876d40dbe0cb1 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Thu, 12 Dec 2019 10:14:28 +0100 Subject: [PATCH 8/8] McParticleEvent: Cleanup of EXTRA_PATTERNS in unit tests Remove ignore patterns in unit tests that are either obsolete or handled by `post.sh` directly. --- .../TruthParticleID/McParticleEvent/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleEvent/CMakeLists.txt index 2822639f7c3..f84711b2e51 100644 --- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/CMakeLists.txt +++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 781479 2016-10-31 21:07:42Z ssnyder $ ################################################################################ # Package: McParticleEvent ################################################################################ @@ -54,8 +53,7 @@ atlas_add_test( TruthParticle_test INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GeneratorObjects TestTools GaudiKernel McParticleEvent - ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" - EXTRA_PATTERNS "^StoreGateSvc +DEBUG Property update for OutputLevel" ) + ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" ) # Install files from the package: atlas_install_python_modules( python/*.py ) -- GitLab