Skip to content

Commit 7a3e417

Browse files
yamaguchi1024vgvassilev
authored andcommitted
[cxxmodules] Temporary excluding tests for cxxmodules build bot
This excludes tests which are failing in runtime modules nightly builds. We want to add runtime modules bot to incrementals and PRs so that people can fix their bugs before commiting.
1 parent c73e6b9 commit 7a3e417

File tree

3 files changed

+24
-0
lines changed

3 files changed

+24
-0
lines changed

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ endif()
353353
if(runtime_cxxmodules)
354354
# Dummy target that does nothing, we don't need a PCH for modules.
355355
add_custom_target(onepcm)
356+
set(FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES On)
356357
else()
357358
add_custom_command(OUTPUT etc/allDict.cxx.pch
358359
COMMAND ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch ${__allIncludes} -I${CMAKE_BINARY_DIR}/include

test/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ ROOT_ADD_TEST(test-stressiterators-interpreted COMMAND ${ROOT_root_CMD} -b -q -l
246246
FAILREGEX "FAILED|Error in" DEPENDS test-stressiterators)
247247

248248
#--stressInterpreter-------------------------------------------------------------------------
249+
# FIXME: Temporary workaround for runtime_cxxmodule
250+
if(NOT FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES)
249251
ROOT_EXECUTABLE(stressInterpreter stressInterpreter.cxx LIBRARIES Core)
250252
if(WIN32)
251253
set(cleantmpfiles POSTCMD cmd /c del AutoDict_*)
@@ -255,6 +257,7 @@ ROOT_ADD_TEST(test-stressinterpreter COMMAND stressInterpreter
255257
$<TARGET_FILE_DIR:stressInterpreter>/stressInterpreter.cxx
256258
${cleantmpfiles}
257259
FAILREGEX Error|FAILED)
260+
endif()
258261

259262
#--stressHepix-------------------------------------------------------------------------------
260263
ROOT_EXECUTABLE(stressHepix stressHepix.cxx LIBRARIES Core)

tutorials/CMakeLists.txt

+20
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,19 @@ if(NOT ROOT_minuit2_FOUND)
6565
tutorials/roostats/rs_bernsteinCorrection.C)
6666
endif()
6767

68+
# FIXME: Temporary workaround for runtime_cxxmodule
69+
if(FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES)
70+
set(runtime_cxxmodules_veto dataframe/tdf013_InspectAnalysis.C
71+
fit/fithist.C
72+
graphics/markerwarning.C
73+
math/quasirandom.C
74+
multicore/mp103_processSelector.C
75+
pythia/pythia8.C
76+
roostats/Zbi_Zgamma.C
77+
roostats/rs_numbercountingutils.C
78+
r/DataFrame.C)
79+
endif()
80+
6881
if(NOT ROOT_roofit_FOUND)
6982
set(roofit_veto fit/RoofitDemo.C
7083
roofit/*.C roostats/*.C histfactory/*.C)
@@ -221,6 +234,7 @@ set(all_veto hsimple.C
221234
${extra_veto}
222235
${gui_veto}
223236
${minuit2_veto}
237+
${runtime_cxxmodules_veto}
224238
${roofit_veto}
225239
${unuran_veto}
226240
${xml_veto}
@@ -395,6 +409,12 @@ if(ROOT_python_FOUND)
395409
list(REMOVE_ITEM pytutorials ${classic_veto_py})
396410
endif()
397411

412+
if(FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES)
413+
set(runtime_cxxmodules_veto_py dataframe/tdf002_dataModel.py
414+
math/tStudent.py)
415+
list(REMOVE_ITEM pytutorials ${runtime_cxxmodules_veto_py})
416+
endif()
417+
398418
#---Python tutorials dependencies--------------------------------------
399419
set(pyroot-ntuple1-depends tutorial-pyroot-hsimple-py)
400420
set(pyroot-h1draw-depends tutorial-pyroot-hsimple-py)

0 commit comments

Comments
 (0)