diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7c128f00c99e91bb5d5aa10a36612a3a3e3b478b..a896ae019e1a5083e9dac5e97eb4cac8fb0eb671 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -144,10 +144,13 @@ ROOT_ADD_TEST(test-stressspectrum-interpreted COMMAND ${ROOT_root_CMD} -b -q -l FAILREGEX "FAILED|Error in" DEPENDS test-stressspectrum LABELS longtest) #--stressVector------------------------------------------------------------------------------------ -ROOT_EXECUTABLE(stressVector stressVector.cxx LIBRARIES Physics GenVector) -ROOT_ADD_TEST(test-stressvector COMMAND stressVector FAILREGEX "FAILED|Error in") -ROOT_ADD_TEST(test-stressvector-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressVector.cxx - FAILREGEX "FAILED|Error in" DEPENDS test-stressvector) +# FIXME: Temporary workaround for runtime_cxxmodule +if(NOT FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES) + ROOT_EXECUTABLE(stressVector stressVector.cxx LIBRARIES Physics GenVector) + ROOT_ADD_TEST(test-stressvector COMMAND stressVector FAILREGEX "FAILED|Error in") + ROOT_ADD_TEST(test-stressvector-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressVector.cxx + FAILREGEX "FAILED|Error in" DEPENDS test-stressvector) +endif() #--stressTMVA-------------------------------------------------------------------------------------- if(CUDA_FOUND) @@ -174,6 +177,8 @@ if(ROOT_mathmore_FOUND) endif() #--stressMathCore---------------------------------------------------------------------------------- +# FIXME: Temporary workaround for runtime_cxxmodule +if(NOT FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES) ROOT_STANDARD_LIBRARY_PACKAGE(TrackMathCoreDict NO_SOURCES NO_INSTALL_HEADERS @@ -189,6 +194,7 @@ ROOT_EXECUTABLE(stressMathCore stressMathCore.cxx LIBRARIES MathCore Hist RIO Tr ROOT_ADD_TEST(test-stressmathcore COMMAND stressMathCore FAILREGEX "FAILED|Error in") ROOT_ADD_TEST(test-stressmathcore-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressMathCore.cxx FAILREGEX "FAILED|Error in" DEPENDS test-stressmathcore) +endif() #--stressRooFit---------------------------------------------------------------------------------- if(ROOT_roofit_FOUND) diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt index 2dc6b54ce5521eab71f0ab7b1cd4843849022564..a1a4417f9f05b3ad6d56be83dd68bf9e4aa76892 100644 --- a/tutorials/CMakeLists.txt +++ b/tutorials/CMakeLists.txt @@ -68,6 +68,7 @@ endif() # FIXME: Temporary workaround for runtime_cxxmodule if(FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES) set(runtime_cxxmodules_veto dataframe/tdf013_InspectAnalysis.C + dataframe/tdf012_DefinesAndFiltersAsStrings.C fit/fithist.C graphics/markerwarning.C math/quasirandom.C @@ -411,6 +412,7 @@ if(ROOT_python_FOUND) if(FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES) set(runtime_cxxmodules_veto_py dataframe/tdf002_dataModel.py + dataframe/tdf012_DefinesAndFiltersAsStrings.py math/tStudent.py) list(REMOVE_ITEM pytutorials ${runtime_cxxmodules_veto_py}) endif()