From 66ca65be0195ab917629cc272b99cf01b0aa8d0c Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <frank.winklmeier@cern.ch> Date: Mon, 6 Jan 2020 15:08:21 +0100 Subject: [PATCH] Migrate EXTRA_PATTERNS to LOG_IGNORE_PATTERN --- Event/EventContainers/CMakeLists.txt | 9 ++++----- Event/xAOD/xAODEventInfo/CMakeLists.txt | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Event/EventContainers/CMakeLists.txt b/Event/EventContainers/CMakeLists.txt index a78bf3a7d82..e091e1b8663 100644 --- a/Event/EventContainers/CMakeLists.txt +++ b/Event/EventContainers/CMakeLists.txt @@ -22,20 +22,19 @@ atlas_add_library( EventContainers atlas_add_test( IdCont SOURCES test/ID_ContainerTest.cxx INCLUDE_DIRS src test EventContainers LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers - EXTRA_PATTERNS "elapsed" + LOG_IGNORE_PATTERN "elapsed" ) atlas_add_test( IdMTCont SOURCES test/IDMT_ContainerTest.cxx INCLUDE_DIRS src test EventContainers LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers - EXTRA_PATTERNS "elapsed" + LOG_IGNORE_PATTERN "elapsed" ) atlas_add_test( IDStressTest SOURCES test/IDC_Realistic_Test.cxx INCLUDE_DIRS src test EventContainers LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers - EXTRA_PATTERNS "elapsed|^no lock time|^deleted|^countHit|^lock time" + LOG_IGNORE_PATTERN "elapsed|^no lock time|^deleted|^countHit|^lock time" ) atlas_add_test( IDCValueTest SOURCES test/IDCValueTest.cxx INCLUDE_DIRS src test EventContainers LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers - EXTRA_PATTERNS "" - ) \ No newline at end of file + ) diff --git a/Event/xAOD/xAODEventInfo/CMakeLists.txt b/Event/xAOD/xAODEventInfo/CMakeLists.txt index a5acaf1763c..8dddfcc7039 100644 --- a/Event/xAOD/xAODEventInfo/CMakeLists.txt +++ b/Event/xAOD/xAODEventInfo/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 744185 2016-05-02 09:31:12Z krasznaa $ ################################################################################ # Package: xAODEventInfo ################################################################################ @@ -36,7 +35,7 @@ atlas_add_test( ut_xaodeventinfo_evtstore_test INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEventInfo PROPERTIES TIMEOUT 300 - EXTRA_PATTERNS "[0-9]+ bytes" ) + LOG_IGNORE_PATTERN "[0-9]+ bytes" ) atlas_add_test( ut_xaodeventinfo_printop_test SOURCES test/ut_xaodeventinfo_printop_test.cxx -- GitLab