Skip to content

Commit

Permalink
[cxxmodules] Enable 17 tests and exclude 2 tests
Browse files Browse the repository at this point in the history
Recent change to master fixed some tests which were excluded previously,
       let's enable them again.
  • Loading branch information
yamaguchi1024 committed May 22, 2018
1 parent 0f666cd commit 7d1af71
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ endif()
if(runtime_cxxmodules)
# Dummy target that does nothing, we don't need a PCH for modules.
add_custom_target(onepcm)
set(FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES On)
else()
add_custom_command(OUTPUT etc/allDict.cxx.pch
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
Expand Down
12 changes: 9 additions & 3 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,12 @@ ROOT_EXECUTABLE(bench bench.cxx LIBRARIES Core TBench)
ROOT_ADD_TEST(test-bench COMMAND bench LABELS longtest)

#--stress------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stress stress.cxx LIBRARIES Event Core Hist RIO Tree Gpad Postscript)
ROOT_ADD_TEST(test-stress COMMAND stress -b FAILREGEX "FAILED|Error in"
DEPENDS test-event LABELS longtest)
# FIXME: Temporary workaround for runtime_cxxmodule
if(NOT FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES)
ROOT_EXECUTABLE(stress stress.cxx LIBRARIES Event Core Hist RIO Tree Gpad Postscript)
ROOT_ADD_TEST(test-stress COMMAND stress -b FAILREGEX "FAILED|Error in"
DEPENDS test-event LABELS longtest)
endif()

#--stressShapes------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressShapes stressShapes.cxx LIBRARIES Geom Tree GenVector Gpad)
Expand Down Expand Up @@ -248,6 +251,8 @@ ROOT_ADD_TEST(test-stressiterators-interpreted COMMAND ${ROOT_root_CMD} -b -q -l
FAILREGEX "FAILED|Error in" DEPENDS test-stressiterators)

#--stressInterpreter-------------------------------------------------------------------------
# FIXME: Temporary workaround for runtime_cxxmodule
if(NOT FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES)
ROOT_EXECUTABLE(stressInterpreter stressInterpreter.cxx LIBRARIES Core)
if(WIN32)
set(cleantmpfiles POSTCMD cmd /c del AutoDict_*)
Expand All @@ -257,6 +262,7 @@ ROOT_ADD_TEST(test-stressinterpreter COMMAND stressInterpreter
$<TARGET_FILE_DIR:stressInterpreter>/stressInterpreter.cxx
${cleantmpfiles}
FAILREGEX Error|FAILED)
endif()

#--stressHepix-------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressHepix stressHepix.cxx LIBRARIES Core)
Expand Down
6 changes: 6 additions & 0 deletions tutorials/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ if(NOT ROOT_minuit2_FOUND)
tutorials/roostats/rs_bernsteinCorrection.C)
endif()

# FIXME: Temporary workaround for runtime_cxxmodule
if(FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES)
set(runtime_cxxmodules_veto tutorials/roostats/rs_numberCountingCombination.C)
endif()

if(NOT ROOT_roofit_FOUND)
set(roofit_veto fit/RoofitDemo.C
roofit/*.C roostats/*.C histfactory/*.C)
Expand Down Expand Up @@ -221,6 +226,7 @@ set(all_veto hsimple.C
${extra_veto}
${gui_veto}
${minuit2_veto}
${runtime_cxxmodules_veto}
${roofit_veto}
${unuran_veto}
${xml_veto}
Expand Down

0 comments on commit 7d1af71

Please sign in to comment.