Skip to content

Commit 105abf7

Browse files
committed
Remove workaround due to root-project/root#2721
1 parent 74694de commit 105abf7

File tree

13 files changed

+6
-43
lines changed

13 files changed

+6
-43
lines changed

cling/reflex/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
# FIXME: Temporary workaround for runtime_cxxmodules;
8-
if(NOT ROOT_runtime_cxxmodules_FOUND)
9-
ROOTTEST_ADD_OLDTEST(LABELS longtest)
10-
endif()
7+
ROOTTEST_ADD_OLDTEST(LABELS longtest)

cling/template/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ ROOTTEST_ADD_TEST(templateSingleton
1212
LABELS roottest regression cling)
1313

1414
ROOTTEST_GENERATE_DICTIONARY(masterDict master.h LINKDEF masterLinkDef.h)
15-
# FIXME: Temporary workaround for runtime_cxxmodule
16-
if(NOT ROOT_runtime_cxxmodules_FOUND)
1715
ROOTTEST_GENERATE_DICTIONARY(slaveDict slave.h LINKDEF slaveLinkDef.h)
18-
endif()
1916
ROOTTEST_GENERATE_DICTIONARY(forwardDict forward.C LINKDEF linkdef.h)
2017
ROOTTEST_GENERATE_DICTIONARY(constructorDict constructor.hh LINKDEF linkdef.h)
2118
ROOTTEST_GENERATE_DICTIONARY(typenameTestDict typenameTest.C LINKDEF linkdef.h)

root/aclic/load/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ ROOTTEST_ADD_TEST(autoload
44
OUTREF execautoload.ref
55
DEPENDS autoloadtest.C)
66

7-
# FIXME: Temporary workaround for runtime_cxxmodules
8-
if(NOT ROOT_runtime_cxxmodules_FOUND)
97
ROOTTEST_ADD_TEST(reload
108
COPY_TO_BUILDDIR Reload.root
119
MACRO assertReload.C
1210
OUTREF assertReload.ref)
13-
endif()
1411

1512
ROOTTEST_ADD_TEST(linktest
1613
MACRO execlinktest.C

root/core/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ if(OPENGL_gl_LIBRARY AND ROOTTEST_OS_ID MATCHES Scientific|CentOS|Ubuntu|Fedora)
2626
set(ROOTTEST_ENV_EXTRA LD_PRELOAD=${OPENGL_gl_LIBRARY})
2727
endif()
2828

29-
# FIXME: Temporary workaround for runtime_cxxmodule
30-
if(NOT ROOT_runtime_cxxmodules_FOUND)
3129
ROOTTEST_ADD_TEST(execStatusBitsCheck
3230
MACRO execStatusBitsCheck.C
3331
OUTCNV ../html/MakeIndex_convert.sh
3432
OUTREF execStatusBitsCheck.ref
3533
)
36-
endif()

root/dataframe/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,10 @@ ROOTTEST_ADD_TEST(test_hugeRDF
4646
DEPENDS ${GENERATE_EXECUTABLE_TEST})
4747
endif()
4848

49-
# FIXME: Temporary workaround for runtime_cxxmodule
50-
if(NOT ROOT_runtime_cxxmodules_FOUND)
5149
ROOTTEST_GENERATE_EXECUTABLE(test_snapshot_manytasks test_snapshot_manytasks.cxx LIBRARIES ${DFLIBRARIES})
5250
ROOTTEST_ADD_TEST(test_snapshot_manytasks
5351
EXEC ./test_snapshot_manytasks
5452
DEPENDS ${GENERATE_EXECUTABLE_TEST})
55-
endif()
5653

5754
ROOTTEST_GENERATE_EXECUTABLE(test_columnoverride test_columnoverride.cxx LIBRARIES ${DFLIBRARIES})
5855
ROOTTEST_ADD_TEST(test_columnoverride
@@ -86,12 +83,9 @@ ROOTTEST_ADD_TEST(test_inference
8683
OUTREF test_inference.ref
8784
DEPENDS ${GENERATE_EXECUTABLE_TEST})
8885

89-
# FIXME: Temporary workaround for runtime_cxxmodule
90-
if(NOT ROOT_runtime_cxxmodules_FOUND)
9186
ROOTTEST_ADD_TEST(test_snapshot
9287
MACRO test_snapshot.C+
9388
OUTREF test_snapshot.ref)
94-
endif()
9589

9690
ROOTTEST_ADD_TEST(test_stringfiltercolumn
9791
MACRO test_stringfiltercolumn.C+

root/meta/ROOT-7181/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
# FIXME: Temporary workaround for runtime_cxxmodule
8-
if(NOT ROOT_runtime_cxxmodules_FOUND)
7+
98
ROOTTEST_ADD_OLDTEST()
10-
endif()

root/meta/ROOT-7462/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
# FIXME: Temporary workaround for runtime_cxxmodule
8-
if(NOT ROOT_runtime_cxxmodules_FOUND)
7+
98
ROOTTEST_ADD_OLDTEST()
10-
endif()

root/meta/autoloading/headerParsingOnDemand/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,12 @@ ROOTTEST_GENERATE_REFLEX_DICTIONARY(FullheaderParsingOnDemand
1212
LIBNAME libFullheaderParsingOnDemand_dictrflx
1313
NO_ROOTMAP)
1414

15-
# FIXME: Temporary workaround for runtime_cxxmodules
16-
if(NOT ROOT_runtime_cxxmodules_FOUND)
1715
ROOTTEST_ADD_TEST(runFullheaderParsingOnDemand
1816
COPY_TO_BUILDDIR headerParsingOnDemand.rootmap
1917
MACRO runFullheaderParsingOnDemand.C
2018
OUTREF headerParsingOnDemand.ref
2119
OUTCNV FullheaderParsingOnDemand_convert.sh
2220
DEPENDS ${GENERATE_REFLEX_TEST})
23-
endif()
2421

2522
ROOTTEST_GENERATE_REFLEX_DICTIONARY(complexTypedefs
2623
complexTypedefs.h

root/meta/cmsUnload/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55
#
66
#-------------------------------------------------------------------------------
7-
# FIXME: Temporary workaround for runtime_cxxmodule
8-
if(NOT ROOT_runtime_cxxmodules_FOUND)
7+
98
ROOTTEST_ADD_OLDTEST()
10-
endif()

root/meta/enums/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,10 @@ ROOTTEST_GENERATE_REFLEX_DICTIONARY(enumsTestClasses
2121
SELECTION enumsTestClasses_selection.xml
2222
NO_ROOTMAP)
2323

24-
# FIXME: Temporary workaround for runtime_cxxmodule
25-
if(NOT ROOT_runtime_cxxmodules_FOUND)
2624
ROOTTEST_ADD_TEST(execEnumsTest
2725
MACRO execEnumsTest.C
2826
OUTREF execEnumsTest.ref
2927
DEPENDS ${GENERATE_REFLEX_TEST})
30-
endif()
3128

3229
ROOTTEST_GENERATE_REFLEX_DICTIONARY(tEnumGetEnumClasses
3330
tEnumGetEnumClasses.h

0 commit comments

Comments
 (0)