diff --git a/Calorimeter/CaloIdentifier/CMakeLists.txt b/Calorimeter/CaloIdentifier/CMakeLists.txt index dd281f0d14d40c9c3f434c1b0031c9e3b8de74fa..bc0fdc474bc838e271433c2511e408971e5c3ab2 100644 --- a/Calorimeter/CaloIdentifier/CMakeLists.txt +++ b/Calorimeter/CaloIdentifier/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( CaloIdentifier ) @@ -39,96 +39,101 @@ atlas_add_executable( caloCellLookup utils/caloCellLookup.cxx LINK_LIBRARIES CaloIdentifier IdDictParser ) +# Tests in the package: + +set( _ignore "mask/zero|Reading file|^AtlasDetectorID(Helper)?::|WARNING MessageSvc not found" ) + #atlas_add_test( GTower_ID_test # SOURCES # test/GTower_ID_test.cxx # INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} # LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib IdDictParser PathResolver CaloIdentifier -# LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) +# LOG_IGNORE_PATTERN ${_ignore} ) #atlas_add_test( JTower_ID_test # SOURCES # test/JTower_ID_test.cxx # INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} # LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib IdDictParser PathResolver CaloIdentifier -# LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) +# LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( LArEM_ID_test SOURCES test/LArEM_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( LArEM_SuperCell_ID_test SOURCES test/LArEM_SuperCell_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( LArHEC_ID_test SOURCES test/LArHEC_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( LArHEC_SuperCell_ID_test SOURCES test/LArHEC_SuperCell_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( LArFCAL_ID_test SOURCES test/LArFCAL_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( LArFCAL_SuperCell_ID_test SOURCES test/LArFCAL_SuperCell_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( LArMiniFCAL_ID_test SOURCES test/LArMiniFCAL_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( TileID_test SOURCES test/TileID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( Tile_SuperCell_ID_test SOURCES test/Tile_SuperCell_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( CaloCell_ID_test SOURCES test/CaloCell_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( CaloCell_SuperCell_ID_test SOURCES test/CaloCell_SuperCell_ID_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( CaloIDHelper_test SOURCES test/CaloIDHelper_test.cxx LINK_LIBRARIES CaloIdentifier IdDictParser - LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" ) + LOG_IGNORE_PATTERN ${_ignore} ) atlas_add_test( CaloHelpersTest_test SOURCES test/CaloHelpersTest_test.cxx - LINK_LIBRARIES CaloIdentifier IdDictParser) + LINK_LIBRARIES CaloIdentifier IdDictParser + LOG_IGNORE_PATTERN ${_ignore} ) # Install files from the package: atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h b/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h index 9a2a97092df983a5a772962882fed0453a431254..c98dad75b6d2187b3484a0dce0956c759ee3c4c1 100644 --- a/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h +++ b/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h @@ -6,7 +6,7 @@ // AthMessaging.h // Header file for class AthMessaging -// Author: S.Binet +// Author: S.Binet, Frank Winklmeier /////////////////////////////////////////////////////////////////// #ifndef ATHENABASECOMPS_ATHMESSAGING_H #define ATHENABASECOMPS_ATHMESSAGING_H 1 @@ -21,18 +21,35 @@ #include "GaudiKernel/MsgStream.h" #include "Gaudi/Property.h" #include "AthenaBaseComps/AthMsgStreamMacros.h" + #include + /** @class AthMessaging AthMessaging.h AthenaBaseComps/AthMessaging.h * - * Mixin class to provide easy @c MsgStream access and capabilities. - * One usually inherits from this class and use it like so: + * @brief Class to provide easy @c MsgStream access and capabilities. + * + * All the expensive operations (e.g. retrieval of MessageSvc) are + * done lazily, i.e. only when a message is printed to keep the + * construction of this class as fast as possible. + * + * One usually inherits from this class and uses it like so: + * @code + * class MyClass : public AthMessaging, ... { + * public: + * MyClass() : AthMessaging("MyName") {} + * void print() { + * ATH_MSG_INFO("Hello World"); + * } + * }; + * @endcode + * + * The above will retrieve the pointer to the MessageSvc when needed. + * If you have access to it already, it is preferred to pass it explicitly: * @code - * void some_method (AthMessaging& o) - * { o.msg() << "foo" << endmsg; } + * MyClass() : AthMessaging(msgSvc, "MyName") {} * @endcode */ - class AthMessaging { @@ -99,30 +116,36 @@ class AthMessaging AthMessaging( const AthMessaging& rhs ); //> not implemented AthMessaging& operator=( const AthMessaging& rhs ); //> not implemented - /////////////////////////////////////////////////////////////////// + /// Initialize our message level and MessageSvc + void initMessaging() const; + + /////////////////////////////////////////////////////////////////// // Private data: /////////////////////////////////////////////////////////////////// private: /// Current logging level. - std::atomic m_lvl; + mutable std::atomic m_lvl{ MSG::NIL }; /// MsgStream instance (a std::cout like with print-out levels) mutable boost::thread_specific_ptr m_msg_tls; - IMessageSvc* m_imsg { nullptr }; + /// MessageSvc pointer + mutable std::atomic m_imsg{ nullptr }; + + /// Message source name std::string m_nm; }; /////////////////////////////////////////////////////////////////// // Inline methods: /////////////////////////////////////////////////////////////////// -//std::ostream& operator<<( std::ostream& out, const AthMessaging& o ); inline bool AthMessaging::msgLvl (const MSG::Level lvl) const { + if (m_lvl == MSG::NIL) initMessaging(); if (m_lvl <= lvl) { msg() << lvl; return true; @@ -137,6 +160,7 @@ AthMessaging::msg() const { MsgStream* ms = m_msg_tls.get(); if (!ms) { + if (m_lvl == MSG::NIL) initMessaging(); ms = new MsgStream(m_imsg,m_nm); m_msg_tls.reset( ms ); } diff --git a/Control/AthenaBaseComps/share/AthMessaging_test.ref b/Control/AthenaBaseComps/share/AthMessaging_test.ref index d2f5915e914a393036420af2d6c9fd050ccd445c..231c2da2a29540b1c727e42457d4c858e2ba5d91 100644 --- a/Control/AthenaBaseComps/share/AthMessaging_test.ref +++ b/Control/AthenaBaseComps/share/AthMessaging_test.ref @@ -2,6 +2,7 @@ Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout MyObj1 WARNING Hello MyObj1 INFO World +Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout MyObj2 WARNING Hello MyObj2 INFO World diff --git a/Control/AthenaBaseComps/src/AthMessaging.cxx b/Control/AthenaBaseComps/src/AthMessaging.cxx index 9f457c61751e6943136511c3d98c9490c08b51ce..0d89ce6b1b3c2c7c8913cfeb9b2188de6a9b7db2 100644 --- a/Control/AthenaBaseComps/src/AthMessaging.cxx +++ b/Control/AthenaBaseComps/src/AthMessaging.cxx @@ -4,7 +4,7 @@ // AthMessaging.cxx // Implementation file for class AthMessaging -// Author: S.Binet +// Author: S.Binet, Frank Winklmeier /////////////////////////////////////////////////////////////////// #include "AthenaBaseComps/AthMessaging.h" @@ -13,20 +13,34 @@ AthMessaging::AthMessaging (IMessageSvc* msgSvc, const std::string& name) : m_imsg(msgSvc), m_nm(name) -{ - MsgStream ms (msgSvc, name); - m_lvl = ms.level(); -} +{} + AthMessaging::AthMessaging (const std::string& name) : - AthMessaging(Athena::getMessageSvc(), name) -{ -} + m_nm(name) +{} + AthMessaging::~AthMessaging() {} + void AthMessaging::setLevel (MSG::Level lvl) { + if (m_lvl == MSG::NIL) initMessaging(); m_lvl = lvl; } + + +/** + * Initialize our message level and MessageSvc. + * + * This method is only called once when m_lvl == MSG::NIL. + */ +void AthMessaging::initMessaging() const +{ + m_imsg = Athena::getMessageSvc(); + m_lvl = m_imsg ? + static_cast( m_imsg.load()->outputLevel(m_nm) ) : + MSG::INFO; +} diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt index 270833503d9636a07a67072451219e2931f98ada..fa1b6f85f74f480ee82fe73c564fd4814d418e58 100644 --- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt +++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( InDetEventTPCnv ) @@ -44,7 +44,7 @@ foreach( name SiWidthCnv_p1_test SiWidthCnv_p2_test PixelClusterCnv_p1_test SOURCES test/${name}.cxx LINK_LIBRARIES InDetEventTPCnv GaudiKernel IdDictParser SGTools InDetReadoutGeometry TestTools InDetIdentifier - LOG_IGNORE_PATTERN "^ *DEBUG |Strip range" + LOG_IGNORE_PATTERN "^ *DEBUG |Strip range|WARNING MessageSvc not found" ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" ) endforeach() diff --git a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/CMakeLists.txt index 2393af220eec7e2987749c88ed396697e942b8bd..9468f159f4b7049cb00443dee96508aa443c972f 100644 --- a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/CMakeLists.txt +++ b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 785966 2016-11-23 12:31:31Z will $ ################################################################################ # Package: ReweightUtils ################################################################################ @@ -54,7 +53,7 @@ atlas_add_test( ut_ParticleScaleFactorTool_test LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AsgAnalysisInterfaces PATInterfaces xAODEgamma CxxUtils PROPERTIES TIMEOUT 600 - LOG_IGNORE_PATTERN "Package.AsgTool... DEBUG") + LOG_IGNORE_PATTERN "Package.AsgTool... DEBUG|WARNING MessageSvc not found") # Install files from the package: atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) diff --git a/TileCalorimeter/TileSvc/TileTPCnv/CMakeLists.txt b/TileCalorimeter/TileSvc/TileTPCnv/CMakeLists.txt index 016495980fd5e7ab12a4fbd3047dce2894838e75..f53d7ec1c91290c47c958de9425e25990d1538bc 100644 --- a/TileCalorimeter/TileSvc/TileTPCnv/CMakeLists.txt +++ b/TileCalorimeter/TileSvc/TileTPCnv/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( TileTPCnv ) @@ -24,80 +24,80 @@ atlas_add_dictionary( OLD_TileTPCnvDict atlas_add_test( TileBeamElemCnv_p1_test SOURCES test/TileBeamElemCnv_p1_test.cxx - LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) + LINK_LIBRARIES AthenaKernel CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) atlas_add_test( TileBeamElemContainerCnv_p1_test SOURCES test/TileBeamElemContainerCnv_p1_test.cxx - LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv + LINK_LIBRARIES CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv LOG_IGNORE_PATTERN "initialize_from_dictionary" ) atlas_add_test( TileCosmicMuonCnv_p1_test SOURCES test/TileCosmicMuonCnv_p1_test.cxx - LINK_LIBRARIES GaudiKernel TestTools TileTPCnv ) + LINK_LIBRARIES CxxUtils GaudiKernel TestTools TileTPCnv ) atlas_add_test( TileCosmicMuonCnv_p2_test SOURCES test/TileCosmicMuonCnv_p2_test.cxx - LINK_LIBRARIES LINK_LIBRARIES GaudiKernel TestTools TileTPCnv ) + LINK_LIBRARIES CxxUtils GaudiKernel TestTools TileTPCnv ) atlas_add_test( TileDigitsCnv_p1_test SOURCES test/TileDigitsCnv_p1_test.cxx - LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) + LINK_LIBRARIES AthenaKernel CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) atlas_add_test( TileDigitsCnv_p2_test SOURCES test/TileDigitsCnv_p2_test.cxx - LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) + LINK_LIBRARIES AthenaKernel CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) atlas_add_test( TileDigitsCnv_p3_test SOURCES test/TileDigitsCnv_p3_test.cxx - LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) + LINK_LIBRARIES AthenaKernel CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) atlas_add_test( TileDigitsContainerCnv_p1_test SOURCES test/TileDigitsContainerCnv_p1_test.cxx - LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv + LINK_LIBRARIES CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv LOG_IGNORE_PATTERN "initialize_from_dictionary" ) atlas_add_test( TileDigitsContainerCnv_p2_test SOURCES test/TileDigitsContainerCnv_p2_test.cxx - LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv + LINK_LIBRARIES CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv LOG_IGNORE_PATTERN "initialize_from_dictionary" ) atlas_add_test( TileDigitsContainerCnv_p3_test SOURCES test/TileDigitsContainerCnv_p3_test.cxx - LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv + LINK_LIBRARIES CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv LOG_IGNORE_PATTERN "initialize_from_dictionary" ) atlas_add_test( TileHitContainerCnv_p1_test SOURCES test/TileHitContainerCnv_p1_test.cxx - LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv + LINK_LIBRARIES CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv LOG_IGNORE_PATTERN "initialize_from_dictionary" ) atlas_add_test( TileRawChannelCnv_p1_test SOURCES test/TileRawChannelCnv_p1_test.cxx - LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) + LINK_LIBRARIES AthenaKernel CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv ) atlas_add_test( TileRawChannelContainerCnv_p1_test SOURCES test/TileRawChannelContainerCnv_p1_test.cxx - LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv + LINK_LIBRARIES CxxUtils GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv LOG_IGNORE_PATTERN "initialize_from_dictionary" ) atlas_add_test( TileTTL1CellCnv_p1_test SOURCES test/TileTTL1CellCnv_p1_test.cxx - LINK_LIBRARIES GaudiKernel TestTools TileTPCnv ) + LINK_LIBRARIES CxxUtils GaudiKernel TestTools TileTPCnv ) atlas_add_test( TileTTL1Cnv_p1_test SOURCES test/TileTTL1Cnv_p1_test.cxx - LINK_LIBRARIES GaudiKernel TestTools TileTPCnv ) + LINK_LIBRARIES CxxUtils GaudiKernel TestTools TileTPCnv ) diff --git a/TileCalorimeter/TileSvc/TileTPCnv/test/TileBeamElemCnv_p1_test.cxx b/TileCalorimeter/TileSvc/TileTPCnv/test/TileBeamElemCnv_p1_test.cxx index 81d21d86004a8deea0fce69ee93e6939de11147f..e2cf4de0ad8a09db05395e84085304b319888aa5 100644 --- a/TileCalorimeter/TileSvc/TileTPCnv/test/TileBeamElemCnv_p1_test.cxx +++ b/TileCalorimeter/TileSvc/TileTPCnv/test/TileBeamElemCnv_p1_test.cxx @@ -14,8 +14,8 @@ #include "TileConditions/TileCablingService.h" #include "TileIdentifier/TileHWID.h" #include "IdDictParser/IdDictParser.h" -#include "TestTools/initGaudi.h" #include "TestTools/leakcheck.h" +#include "AthenaKernel/getMessageSvc.h" #include "CxxUtils/checker_macros.h" #include "GaudiKernel/MsgStream.h" #include @@ -80,6 +80,7 @@ void test1 ATLAS_NOT_THREAD_SAFE () int main ATLAS_NOT_THREAD_SAFE () { + Athena::getMessageSvcQuiet = true; IdDictParser parser; TileCablingSvc::init_idhelpers(parser); test1(); diff --git a/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p1_test.cxx b/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p1_test.cxx index e4b93b0d209fe5562a0bcf5cc3d64319156c50a2..1905aaadfadce8a5a34f7ea4f23483f25a03db5c 100644 --- a/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p1_test.cxx +++ b/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p1_test.cxx @@ -14,8 +14,8 @@ #include "TileConditions/TileCablingService.h" #include "TileIdentifier/TileHWID.h" #include "IdDictParser/IdDictParser.h" -#include "TestTools/initGaudi.h" #include "TestTools/leakcheck.h" +#include "AthenaKernel/getMessageSvc.h" #include "CxxUtils/checker_macros.h" #include "GaudiKernel/MsgStream.h" #include @@ -80,6 +80,7 @@ void test1 ATLAS_NOT_THREAD_SAFE () int main ATLAS_NOT_THREAD_SAFE () { + Athena::getMessageSvcQuiet = true; IdDictParser parser; TileCablingSvc::init_idhelpers(parser); test1(); diff --git a/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p2_test.cxx b/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p2_test.cxx index 7771053bf50f53bba0e588080ee1d57e4b049613..20c2ea7b095d74f796fce3b983fc86b2f0a61a05 100644 --- a/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p2_test.cxx +++ b/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p2_test.cxx @@ -14,8 +14,8 @@ #include "TileConditions/TileCablingService.h" #include "TileIdentifier/TileHWID.h" #include "IdDictParser/IdDictParser.h" -#include "TestTools/initGaudi.h" #include "TestTools/leakcheck.h" +#include "AthenaKernel/getMessageSvc.h" #include "CxxUtils/checker_macros.h" #include "GaudiKernel/MsgStream.h" #include @@ -80,6 +80,7 @@ void test1 ATLAS_NOT_THREAD_SAFE () int main ATLAS_NOT_THREAD_SAFE () { + Athena::getMessageSvcQuiet = true; IdDictParser parser; TileCablingSvc::init_idhelpers(parser); test1(); diff --git a/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p3_test.cxx b/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p3_test.cxx index 659bc5251751f12417d5de29e0924fc8c632bffc..0082a13bb7e8203963529b8d186b287d713bfbca 100644 --- a/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p3_test.cxx +++ b/TileCalorimeter/TileSvc/TileTPCnv/test/TileDigitsCnv_p3_test.cxx @@ -14,8 +14,8 @@ #include "TileConditions/TileCablingService.h" #include "TileIdentifier/TileHWID.h" #include "IdDictParser/IdDictParser.h" -#include "TestTools/initGaudi.h" #include "TestTools/leakcheck.h" +#include "AthenaKernel/getMessageSvc.h" #include "CxxUtils/checker_macros.h" #include "GaudiKernel/MsgStream.h" #include @@ -80,6 +80,7 @@ void test1 ATLAS_NOT_THREAD_SAFE () int main ATLAS_NOT_THREAD_SAFE () { + Athena::getMessageSvcQuiet = true; IdDictParser parser; TileCablingSvc::init_idhelpers(parser); test1(); diff --git a/TileCalorimeter/TileSvc/TileTPCnv/test/TileRawChannelCnv_p1_test.cxx b/TileCalorimeter/TileSvc/TileTPCnv/test/TileRawChannelCnv_p1_test.cxx index 2529f56f1b556f566ee859e9a22a33a9c4d91e42..eb98deed0cd06b99fd1705f0e6d3c44065c4d758 100644 --- a/TileCalorimeter/TileSvc/TileTPCnv/test/TileRawChannelCnv_p1_test.cxx +++ b/TileCalorimeter/TileSvc/TileTPCnv/test/TileRawChannelCnv_p1_test.cxx @@ -14,8 +14,8 @@ #include "TileConditions/TileCablingService.h" #include "TileIdentifier/TileHWID.h" #include "IdDictParser/IdDictParser.h" -#include "TestTools/initGaudi.h" #include "TestTools/leakcheck.h" +#include "AthenaKernel/getMessageSvc.h" #include "CxxUtils/checker_macros.h" #include "GaudiKernel/MsgStream.h" #include @@ -93,6 +93,7 @@ void test1 ATLAS_NOT_THREAD_SAFE () int main ATLAS_NOT_THREAD_SAFE () { + Athena::getMessageSvcQuiet = true; IdDictParser parser; TileCablingSvc::init_idhelpers(parser); test1();