Merge branch 'asg/tests' into 'master'

Disable tests that should not run in AthAnalysis

See merge request atlas/athena!39471

Database/IOVDbSvc/CMakeLists.txt

@@ -183,7 +183,7 @@ atlas_add_test( Base64Codec_test
    LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES}
    POST_EXEC_SCRIPT "nopost.sh" )
 
-if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
+if( NOT SIMULATIONBASE AND NOT GENERATIONBASE AND NOT XAOD_ANALYSIS )
    atlas_add_test( IOVDbSvcCfgTest
       SCRIPT python -m IOVDbSvc.IOVDbSvcConfig
       POST_EXEC_SCRIPT "nopost.sh" )

LumiBlock/LumiBlockComps/CMakeLists.txt

@@ -61,24 +61,24 @@ if( NOT XAOD_ANALYSIS )
    atlas_add_test( TrigLiveFractionCondAlg_test
       SOURCES test/TrigLiveFractionCondAlg_test.cxx
       LINK_LIBRARIES GaudiKernel LumiBlockData LumiBlockCompsLib TestTools )
-endif()
 
-atlas_add_test( LuminosityCondAlgConfig_test
-                SCRIPT python -m LumiBlockComps.LuminosityCondAlgConfig
-                LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
+   atlas_add_test( LuminosityCondAlgConfig_test
+                   SCRIPT python -m LumiBlockComps.LuminosityCondAlgConfig
+                   LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
 
-atlas_add_test( LBDurationCondAlgConfig_test
-                SCRIPT python -m LumiBlockComps.LBDurationCondAlgConfig
-                LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
+   atlas_add_test( LBDurationCondAlgConfig_test
+                   SCRIPT python -m LumiBlockComps.LBDurationCondAlgConfig
+                   LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
 
-atlas_add_test( TrigLiveFractionCondAlgConfig_test
-                SCRIPT python -m LumiBlockComps.TrigLiveFractionCondAlgConfig
-                LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
+   atlas_add_test( TrigLiveFractionCondAlgConfig_test
+                   SCRIPT python -m LumiBlockComps.TrigLiveFractionCondAlgConfig
+                   LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
 
-atlas_add_test( LumiBlockMuWriterConfig_test
-                SCRIPT python -m LumiBlockComps.LumiBlockMuWriterConfig
-                LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
+   atlas_add_test( LumiBlockMuWriterConfig_test
+                   SCRIPT python -m LumiBlockComps.LumiBlockMuWriterConfig
+                   LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
 
-atlas_add_test( BunchCrossingCondAlg
-                SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/BunchCrossingCondAlgTest.py
-                POST_EXEC_SCRIPT " /usr/bin/diff BCData.txt ${CMAKE_CURRENT_SOURCE_DIR}/share/BCData.txt.ref > BC_diff.log " )
+   atlas_add_test( BunchCrossingCondAlg
+                   SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/BunchCrossingCondAlgTest.py
+                   POST_EXEC_SCRIPT " /usr/bin/diff BCData.txt ${CMAKE_CURRENT_SOURCE_DIR}/share/BCData.txt.ref > BC_diff.log " )
+endif()

PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt

@@ -28,5 +28,7 @@ atlas_add_dictionary( PhotonVertexSelectionDict
    LINK_LIBRARIES PhotonVertexSelectionLib )
 
 # Test(s) in the package:
-atlas_add_test( PhotonVertexSelection_test
-   SCRIPT test/testPhotonVertexSelection.py )
+if( NOT XAOD_ANALYSIS )
+   atlas_add_test( PhotonVertexSelection_test
+      SCRIPT test/testPhotonVertexSelection.py )
+endif()

PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/CMakeLists.txt

@@ -47,7 +47,7 @@ endif()
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 
-if (NOT XAOD_STANDALONE)
+if (NOT XAOD_STANDALONE AND NOT XAOD_ANALYSIS)
   atlas_add_test( flake8_test
                   SCRIPT ${ATLAS_FLAKE8} ${CMAKE_CURRENT_SOURCE_DIR}/test
                   POST_EXEC_SCRIPT nopost.sh )

Reconstruction/Jet/JetRec/CMakeLists.txt

@@ -87,7 +87,7 @@ atlas_add_test(JetClustererTest
     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}
     LINK_LIBRARIES ${ROOT_LIBRARIES} ${GTEST_LIBRARIES} JetRecLib )
 
-if ( NOT GENERATIONBASE AND NOT XAOD_STANDALONE )
+if ( NOT GENERATIONBASE AND NOT XAOD_STANDALONE AND NOT XAOD_ANALYSIS )
    atlas_add_test(JetRecAlg_Test SCRIPT share/JetRecAlgTestCfg.py )
 endif()
 

Reconstruction/Jet/JetReclustering/CMakeLists.txt

@@ -34,7 +34,7 @@ atlas_add_dictionary( JetReclusteringDict
    LINK_LIBRARIES JetReclusteringLib )
 
 # Test(s) in the package:
-if( NOT XAOD_STANDALONE )
+if( NOT XAOD_STANDALONE AND NOT XAOD_ANALYSIS )
    atlas_add_test( ut_JetReclusteringTool_test
       SOURCES test/ut_JetReclusteringTool_test.cxx
       LINK_LIBRARIES xAODRootAccess AsgTools JetInterface xAODJet