File tree Expand file tree Collapse file tree 9 files changed +8
-19
lines changed Expand file tree Collapse file tree 9 files changed +8
-19
lines changed Original file line number Diff line number Diff line change 44# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55#
66#-------------------------------------------------------------------------------
7+
78ROOTTEST_ADD_OLDTEST(LABELS longtest)
Original file line number Diff line number Diff line change @@ -11,9 +11,7 @@ ROOTTEST_ADD_TEST(templateSingleton
1111 DEPENDS Singleton.h
1212 LABELS roottest regression cling)
1313
14- if (NOT ROOT_runtime_cxxmodules_FOUND)
15- ROOTTEST_GENERATE_DICTIONARY(slaveDict slave.h LINKDEF slaveLinkDef.h)
16- endif ()
14+ ROOTTEST_GENERATE_DICTIONARY(slaveDict slave.h LINKDEF slaveLinkDef.h)
1715ROOTTEST_GENERATE_DICTIONARY(masterDict master.h LINKDEF masterLinkDef.h)
1816ROOTTEST_GENERATE_DICTIONARY(forwardDict forward.C LINKDEF linkdef.h)
1917ROOTTEST_GENERATE_DICTIONARY(constructorDict constructor.hh LINKDEF linkdef.h)
Original file line number Diff line number Diff line change @@ -5,4 +5,3 @@ if(ROOT_python_FOUND)
55 PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ StlTypes.C+
66 ENVIRONMENT EXP_PYROOT=${exp_pyroot} )
77endif ()
8-
Original file line number Diff line number Diff line change @@ -42,11 +42,8 @@ configure_file(templateAutoload.rootmap . COPYONLY)
4242configure_file (typelist.v5.txt . COPYONLY )
4343configure_file (typelist.v6.txt . COPYONLY )
4444
45- # FIXME: Temporary workaround for runtime_cxxmodules;
46- if (NOT ROOT_runtime_cxxmodules_FOUND)
4745ROOTTEST_ADD_AUTOMACROS(DEPENDS ANSTmpltInt.C TmpltInt0.C TmpltInt1.C TmpltFloat.C
4846 TmpltNoSpec.C Event.cxx ${COMPILE_MACRO_TEST} )
49- endif ()
5047
5148
5249ROOTTEST_ADD_TEST(drawing
Original file line number Diff line number Diff line change 1- if (ROOT_runtime_cxxmodules_FOUND)
2- set (excluded_rtcxxmod_tests friend fastcloningeventtree)
3- ROOTTEST_ADD_TESTDIRS(EXCLUDED_DIRS ${excluded_rtcxxmod_tests} )
4- else ()
5- set (excluded_tests fastcloningeventtree)
6- ROOTTEST_ADD_TESTDIRS(EXCLUDED_DIRS ${excluded_tests} )
7- endif ()
1+ set (excluded_tests fastcloningeventtree)
2+ ROOTTEST_ADD_TESTDIRS(EXCLUDED_DIRS ${excluded_tests} )
Original file line number Diff line number Diff line change 44# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55#
66#-------------------------------------------------------------------------------
7- ROOTTEST_ADD_OLDTEST(LABELS longtest)
87
8+ ROOTTEST_ADD_OLDTEST(LABELS longtest)
Original file line number Diff line number Diff line change 44# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55#
66#-------------------------------------------------------------------------------
7- ROOTTEST_ADD_OLDTEST(LABELS longtest)
87
8+ ROOTTEST_ADD_OLDTEST(LABELS longtest)
Original file line number Diff line number Diff line change 44# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55#
66#-------------------------------------------------------------------------------
7- if (NOT ROOT_runtime_cxxmodules_FOUND)
8- ROOTTEST_ADD_OLDTEST()
9- endif ()
7+ ROOTTEST_ADD_OLDTEST()
Original file line number Diff line number Diff line change 44# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
55#
66#-------------------------------------------------------------------------------
7+
78ROOTTEST_ADD_OLDTEST(LABELS longtest)
You can’t perform that action at this time.
0 commit comments