[cxxmodules] Enable 17 tests and exclude 2 tests (#2040)

* Revert "[cxxmodules] Exclude TFormula test" This reverts commit 6bcb242. * Revert "[cxxmodules] Exclude remaining tests" This reverts commit bea06e8. * Revert "[cxxmodules] Temporary excluding tests for cxxmodules build bot" This reverts commit 7a3e417. * [cxxmodules] Enable 17 tests and exclude 3 tests Recent change to master fixed some tests which were excluded previously, let's enable them again.
root-project · May 22, 2018 · 10c22d1 · 10c22d1
1 parent c819524
commit 10c22d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 33 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -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)
@@ -144,13 +147,10 @@ ROOT_ADD_TEST(test-stressspectrum-interpreted COMMAND ${ROOT_root_CMD} -b -q -l
               FAILREGEX "FAILED|Error in" DEPENDS test-stressspectrum LABELS longtest)
 
 #--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()
+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)
 
 #--stressTMVA--------------------------------------------------------------------------------------
 if(CUDA_FOUND)
@@ -177,8 +177,6 @@ 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
@@ -194,9 +192,10 @@ 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----------------------------------------------------------------------------------
+# FIXME: Temporary workaround for runtime_cxxmodule
+if(NOT FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES)
 if(ROOT_roofit_FOUND)
   ROOT_EXECUTABLE(stressRooFit stressRooFit.cxx LIBRARIES RooFit)
   configure_file(stressRooFit_ref.root stressRooFit_ref.root COPYONLY) 
@@ -206,6 +205,7 @@ if(ROOT_roofit_FOUND)
 
   add_subdirectory(fit)
 endif()
+endif()
 
 #--stressRooStats----------------------------------------------------------------------------------
 if(ROOT_roofit_FOUND)
@@ -313,14 +313,11 @@ ROOT_EXECUTABLE(delaunayTriangulation delaunayTriangulation.cxx LIBRARIES Hist)
 ROOT_ADD_TEST(test-delaunay COMMAND delaunayTriangulation)
 
 #--TestTformula------------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT FIXME_TEMPORARILY_EXCLUDED_FOR_RUNTIME_CXXMODULES)
 ROOT_EXECUTABLE(TFormulaTests TFormulaTests.cxx LIBRARIES Hist RIO)
 if(MSVC)
   set_property(TARGET TFormulaTests APPEND_STRING PROPERTY LINK_FLAGS "/STACK:4000000")
 endif()
 ROOT_ADD_TEST(test-TFormulaTests COMMAND TFormulaTests FAILREGEX "FAILED|Error in")
-endif()
 
 #--TBB basic test----------------------------------------------------------------------------------
 if(ROOT_imt_FOUND)

diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
@@ -67,16 +67,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
-                              multicore/mp103_processSelector.C
-                              pythia/pythia8.C
-                              roostats/Zbi_Zgamma.C
-                              roostats/rs_numbercountingutils.C
-                              r/DataFrame.C)
+  set(runtime_cxxmodules_veto tutorials/roostats/rs_numberCountingCombination.C)
 endif()
 
 if(NOT ROOT_roofit_FOUND)
@@ -410,13 +401,6 @@ if(ROOT_python_FOUND)
     list(REMOVE_ITEM pytutorials ${classic_veto_py})
   endif()
 
-  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()
-
   #---Python tutorials dependencies--------------------------------------
   set(pyroot-ntuple1-depends tutorial-pyroot-hsimple-py)
   set(pyroot-h1draw-depends tutorial-pyroot-hsimple-py)