Remove all workarounds wrt cxxmodules.

vgvassilev · vgvassilev · commit 3ea239bd3ce1 · 2018-09-29T20:38:07.000+02:00
diff --git a/cling/array/CMakeLists.txt b/cling/array/CMakeLists.txt
@@ -1,9 +1,6 @@
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_TEST(runarray1
                   COPY_TO_BUILDDIR array1.C
                   MACRO runarray1test.C
                   OUTREF array1test.ref
                   OUTCNV array1test_convert.sh
                   LABELS roottest regression cling)
-endif()
diff --git a/cling/reflex/CMakeLists.txt b/cling/reflex/CMakeLists.txt
@@ -4,7 +4,5 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodules;
-if(NOT ROOT_runtime_cxxmodules_FOUND)
-  ROOTTEST_ADD_OLDTEST(LABELS longtest)
-endif()
+
+ROOTTEST_ADD_OLDTEST(LABELS longtest)
diff --git a/cling/template/CMakeLists.txt b/cling/template/CMakeLists.txt
@@ -12,10 +12,7 @@ ROOTTEST_ADD_TEST(templateSingleton
                   LABELS roottest regression cling)
 
 ROOTTEST_GENERATE_DICTIONARY(masterDict       master.h       LINKDEF masterLinkDef.h)
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_GENERATE_DICTIONARY(slaveDict        slave.h        LINKDEF slaveLinkDef.h)
-endif()
 ROOTTEST_GENERATE_DICTIONARY(forwardDict      forward.C      LINKDEF linkdef.h)
 ROOTTEST_GENERATE_DICTIONARY(constructorDict  constructor.hh LINKDEF linkdef.h)
 ROOTTEST_GENERATE_DICTIONARY(typenameTestDict typenameTest.C LINKDEF linkdef.h)
diff --git a/python/stl/CMakeLists.txt b/python/stl/CMakeLists.txt
@@ -1,9 +1,6 @@
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 if(ROOT_python_FOUND)
   ROOTTEST_ADD_TEST(stl
                     MACRO PyROOT_stltests.py
                     COPY_TO_BUILDDIR StlTypes.C
                     PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ StlTypes.C+)
 endif()
-endif()
diff --git a/root/aclic/load/CMakeLists.txt b/root/aclic/load/CMakeLists.txt
@@ -4,13 +4,10 @@ ROOTTEST_ADD_TEST(autoload
                   OUTREF execautoload.ref
                   DEPENDS autoloadtest.C)
 
-# FIXME: Temporary workaround for runtime_cxxmodules
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_TEST(reload
                   COPY_TO_BUILDDIR Reload.root
                   MACRO assertReload.C
                   OUTREF assertReload.ref)
-endif()
 
 ROOTTEST_ADD_TEST(linktest
                   MACRO execlinktest.C
diff --git a/root/core/CMakeLists.txt b/root/core/CMakeLists.txt
@@ -26,11 +26,8 @@ if(OPENGL_gl_LIBRARY AND ROOTTEST_OS_ID MATCHES Scientific|CentOS|Ubuntu|Fedora)
    set(ROOTTEST_ENV_EXTRA LD_PRELOAD=${OPENGL_gl_LIBRARY})
 endif()
 
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_TEST(execStatusBitsCheck
                   MACRO execStatusBitsCheck.C
                   OUTCNV ../html/MakeIndex_convert.sh
                   OUTREF execStatusBitsCheck.ref
                   )
-endif()
diff --git a/root/dataframe/CMakeLists.txt b/root/dataframe/CMakeLists.txt
@@ -46,13 +46,10 @@ ROOTTEST_ADD_TEST(test_hugeRDF
                   DEPENDS ${GENERATE_EXECUTABLE_TEST})
 endif()
 
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_GENERATE_EXECUTABLE(test_snapshot_manytasks test_snapshot_manytasks.cxx LIBRARIES ${DFLIBRARIES})
 ROOTTEST_ADD_TEST(test_snapshot_manytasks
                   EXEC ./test_snapshot_manytasks
                   DEPENDS ${GENERATE_EXECUTABLE_TEST})
-endif()
 
 ROOTTEST_GENERATE_EXECUTABLE(test_columnoverride test_columnoverride.cxx LIBRARIES ${DFLIBRARIES})
 ROOTTEST_ADD_TEST(test_columnoverride
@@ -86,12 +83,9 @@ ROOTTEST_ADD_TEST(test_inference
                   OUTREF test_inference.ref
                   DEPENDS ${GENERATE_EXECUTABLE_TEST})
 
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_TEST(test_snapshot
                   MACRO test_snapshot.C+
                   OUTREF test_snapshot.ref)
-endif()
 
 ROOTTEST_ADD_TEST(test_stringfiltercolumn
                   MACRO test_stringfiltercolumn.C+
diff --git a/root/io/CMakeLists.txt b/root/io/CMakeLists.txt
@@ -1,4 +1 @@
-# FIXME: Temporary workaround for runtime_cxxmodules
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_TESTDIRS()
-endif()
diff --git a/root/meta/CMakeLists.txt b/root/meta/CMakeLists.txt
@@ -1,8 +1,5 @@
-# FIXME: Temporary workaround for runtime_cxxmodules;
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_TEST(getFuncBody
                   MACRO getFuncBody.C)
-endif()
 
 ROOTTEST_ADD_TEST(countIncludePaths
                   MACRO countIncludePaths.C)
@@ -31,15 +28,12 @@ ROOTTEST_ADD_TEST(execpragmasTest
                   MACRO execpragmasTest.C+
                   OUTREF execpragmasTest.ref)
 
-# FIXME: Temporary workaround for runtime_cxxmodules
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_GENERATE_EXECUTABLE(loadernotapp loadernotapp.cxx LIBRARIES Core Hist)
 
 ROOTTEST_ADD_TEST(loadernotapp
                   EXEC ${CMAKE_CURRENT_BINARY_DIR}/loadernotapp
                   OUTREF loadernotapp.ref
                   DEPENDS ${GENERATE_EXECUTABLE_TEST})
-endif()
 
 ROOTTEST_COMPILE_MACRO(fornamespace.C)
 
@@ -48,11 +42,8 @@ configure_file(templateAutoload.rootmap . COPYONLY)
 configure_file(typelist.v5.txt . COPYONLY)
 configure_file(typelist.v6.txt . COPYONLY)
 
-# FIXME: Temporary workaround for runtime_cxxmodules;
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_AUTOMACROS(DEPENDS ANSTmpltInt.C TmpltInt0.C TmpltInt1.C TmpltFloat.C
                                 TmpltNoSpec.C Event.cxx ${COMPILE_MACRO_TEST})
-endif()
 
 
 ROOTTEST_ADD_TEST(drawing
diff --git a/root/meta/ROOT-7181/CMakeLists.txt b/root/meta/ROOT-7181/CMakeLists.txt
@@ -4,7 +4,5 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
+
 ROOTTEST_ADD_OLDTEST()
-endif()
diff --git a/root/meta/ROOT-7462/CMakeLists.txt b/root/meta/ROOT-7462/CMakeLists.txt
@@ -4,7 +4,5 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
+
 ROOTTEST_ADD_OLDTEST()
-endif()
diff --git a/root/meta/autoloading/headerParsingOnDemand/CMakeLists.txt b/root/meta/autoloading/headerParsingOnDemand/CMakeLists.txt
@@ -12,15 +12,12 @@ ROOTTEST_GENERATE_REFLEX_DICTIONARY(FullheaderParsingOnDemand
                                     LIBNAME libFullheaderParsingOnDemand_dictrflx
                                     NO_ROOTMAP)
 
-# FIXME: Temporary workaround for runtime_cxxmodules
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_TEST(runFullheaderParsingOnDemand
                   COPY_TO_BUILDDIR headerParsingOnDemand.rootmap
                   MACRO runFullheaderParsingOnDemand.C
                   OUTREF headerParsingOnDemand.ref
                   OUTCNV FullheaderParsingOnDemand_convert.sh
                   DEPENDS ${GENERATE_REFLEX_TEST})
-endif()
 
 ROOTTEST_GENERATE_REFLEX_DICTIONARY(complexTypedefs
                                     complexTypedefs.h
diff --git a/root/meta/cmsUnload/CMakeLists.txt b/root/meta/cmsUnload/CMakeLists.txt
@@ -4,7 +4,5 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
+
 ROOTTEST_ADD_OLDTEST()
-endif()
diff --git a/root/meta/enums/CMakeLists.txt b/root/meta/enums/CMakeLists.txt
@@ -21,13 +21,10 @@ ROOTTEST_GENERATE_REFLEX_DICTIONARY(enumsTestClasses
                                     SELECTION enumsTestClasses_selection.xml
                                     NO_ROOTMAP)
 
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_TEST(execEnumsTest
                   MACRO execEnumsTest.C
                   OUTREF execEnumsTest.ref
                   DEPENDS ${GENERATE_REFLEX_TEST})
-endif()
 
 ROOTTEST_GENERATE_REFLEX_DICTIONARY(tEnumGetEnumClasses
                                     tEnumGetEnumClasses.h
diff --git a/root/meta/fwdDecls/CMakeLists.txt b/root/meta/fwdDecls/CMakeLists.txt
@@ -9,12 +9,9 @@ ROOTTEST_ADD_TEST(clingFwdDeclExample
 
 ROOTTEST_GENERATE_REFLEX_DICTIONARY(fwdDeclarations fwdDeclarations.h SELECTION fwdDeclarations_selection.xml NO_ROOTMAP)
 
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_ADD_TEST(fwdDeclarations
                   MACRO execfwdDeclarations.C
                   OUTREF execfwdDeclarations.ref
                   DEPENDS ${GENERATE_REFLEX_TEST})
-endif()
 
 ROOTTEST_ADD_TESTDIRS()
diff --git a/root/meta/genreflex/CMakeLists.txt b/root/meta/genreflex/CMakeLists.txt
@@ -136,15 +136,12 @@ ROOTTEST_ADD_TEST(virtualInheritance
                   COMMAND ${ROOT_genreflex_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/virtualInheritance.h --verbose --select=${CMAKE_CURRENT_SOURCE_DIR}/virtualInheritance_selection.xml
                   OUTREF virtualInheritance.ref)
 
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
 ROOTTEST_GENERATE_REFLEX_DICTIONARY(typedefSelection typedefSelection.h SELECTION typedefSelection_selection.xml)
 
 ROOTTEST_ADD_TEST(typedefSelection
                   MACRO execTypedefSelection.C
                   OUTREF execTypedefSelection.ref
                   DEPENDS ${GENERATE_REFLEX_TEST})
-endif()
 
 ROOTTEST_GENERATE_REFLEX_DICTIONARY(stlPatternSelection stlPatternSelection.h SELECTION stlPatternSelection_selection.xml)
 
diff --git a/root/tree/addresses/CMakeLists.txt b/root/tree/addresses/CMakeLists.txt
@@ -4,7 +4,5 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
+
 ROOTTEST_ADD_OLDTEST(LABELS longtest)
-endif()
diff --git a/root/tree/array/CMakeLists.txt b/root/tree/array/CMakeLists.txt
@@ -4,7 +4,5 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
+
 ROOTTEST_ADD_OLDTEST()
-endif()
diff --git a/root/tree/chain/CMakeLists.txt b/root/tree/chain/CMakeLists.txt
@@ -4,7 +4,5 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
+
 ROOTTEST_ADD_OLDTEST()
-endif()
diff --git a/root/treeformula/parse/CMakeLists.txt b/root/treeformula/parse/CMakeLists.txt
@@ -4,7 +4,5 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
+
 ROOTTEST_ADD_OLDTEST(LABELS longtest)
-endif()
diff --git a/root/treeproxy/CMakeLists.txt b/root/treeproxy/CMakeLists.txt
@@ -4,7 +4,5 @@
 # define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
 #
 #-------------------------------------------------------------------------------
-# FIXME: Temporary workaround for runtime_cxxmodule
-if(NOT ROOT_runtime_cxxmodules_FOUND)
+
 ROOTTEST_ADD_OLDTEST(LABELS longtest)
-endif()

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,5 @@`
`4`	`4`	`# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}`
`5`	`5`	`#`
`6`	`6`	`#-------------------------------------------------------------------------------`
`7`		`-# FIXME: Temporary workaround for runtime_cxxmodule`
`8`		`-if(NOT ROOT_runtime_cxxmodules_FOUND)`
	`7`	`+`
`9`	`8`	`ROOTTEST_ADD_OLDTEST()`
`10`		`-endif()`