From a08db1165d38bf6b03a70f45f073e9b2c40a1966 Mon Sep 17 00:00:00 2001 From: Philippe Canal Date: Tue, 1 Jul 2025 17:49:11 +0000 Subject: [PATCH 1/2] roottest: No module generation in MakeProject test --- roottest/root/meta/MakeProject/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roottest/root/meta/MakeProject/CMakeLists.txt b/roottest/root/meta/MakeProject/CMakeLists.txt index 5d77729abae2a..0c3605f94552e 100644 --- a/roottest/root/meta/MakeProject/CMakeLists.txt +++ b/roottest/root/meta/MakeProject/CMakeLists.txt @@ -1,4 +1,4 @@ -ROOTTEST_GENERATE_DICTIONARY(stl_makeproject_test stl_makeproject_test.h LINKDEF stl_makeproject_test_linkdef.h) +ROOTTEST_GENERATE_DICTIONARY(stl_makeproject_test stl_makeproject_test.h LINKDEF stl_makeproject_test_linkdef.h NO_ROOTMAP NO_CXXMODULE) # If we build roottest in-tree, add a dependecy on Hist because the header # includes TH1D. if(TARGET Hist) From 213f5e78126ef4b6c80145169dbfbb8fd02b6474 Mon Sep 17 00:00:00 2001 From: Philippe Canal Date: Wed, 9 Jul 2025 21:19:17 +0000 Subject: [PATCH 2/2] roottest: do not generate unneeded pcm files. The tests are checking if the dictionary source files can compile. Having the pcm files around can affect the other tests in the same directory, for example in case those other test runs before the pcm has been rebuild (and it depend on something that has already been rebuild). --- roottest/cling/parsing/CMakeLists.txt | 4 ++-- roottest/cling/stl/map/CMakeLists.txt | 2 +- roottest/cling/template/CMakeLists.txt | 8 ++++---- roottest/cling/templateMembers/CMakeLists.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roottest/cling/parsing/CMakeLists.txt b/roottest/cling/parsing/CMakeLists.txt index 57c24d20c5e58..66ee894b7e4d9 100644 --- a/roottest/cling/parsing/CMakeLists.txt +++ b/roottest/cling/parsing/CMakeLists.txt @@ -9,8 +9,8 @@ ROOTTEST_ADD_TEST(runoperatorLessThanTemplate MACRO runoperatorLessThanTemplate.C LABELS roottest regression cling) -ROOTTEST_GENERATE_DICTIONARY(scopeDict scopeProblem.C LINKDEF linkdef.h) -ROOTTEST_GENERATE_DICTIONARY(scopeDict2 multiScope.C LINKDEF linkdef.h) +ROOTTEST_GENERATE_DICTIONARY(scopeDict scopeProblem.C NO_CXXMODULE LINKDEF linkdef.h) +ROOTTEST_GENERATE_DICTIONARY(scopeDict2 multiScope.C NO_CXXMODULE LINKDEF linkdef.h) ROOTTEST_ADD_TEST(runReadbool MACRO runReadbool.C diff --git a/roottest/cling/stl/map/CMakeLists.txt b/roottest/cling/stl/map/CMakeLists.txt index da246377af7b2..26ee8d6c1efc3 100644 --- a/roottest/cling/stl/map/CMakeLists.txt +++ b/roottest/cling/stl/map/CMakeLists.txt @@ -1,4 +1,4 @@ -ROOTTEST_GENERATE_DICTIONARY(dict.C testing.C LINKDEF LinkDef.h) +# ROOTTEST_GENERATE_DICTIONARY(dict.C testing.C NO_CXXMODULE LINKDEF LinkDef.h) ROOTTEST_COMPILE_MACRO(MyOpClass.C FIXTURES_SETUP cling-stl-map-MyOpClass-fixtures) diff --git a/roottest/cling/template/CMakeLists.txt b/roottest/cling/template/CMakeLists.txt index 052a286a3c98d..0eeb493508814 100644 --- a/roottest/cling/template/CMakeLists.txt +++ b/roottest/cling/template/CMakeLists.txt @@ -19,10 +19,10 @@ ROOTTEST_ADD_TEST(templateSingleton if(NOT ROOT_runtime_cxxmodules_FOUND) ROOTTEST_GENERATE_DICTIONARY(slaveDict slave.h LINKDEF slaveLinkDef.h) endif() -ROOTTEST_GENERATE_DICTIONARY(masterDict master.h LINKDEF masterLinkDef.h) -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 +ROOTTEST_GENERATE_DICTIONARY(masterDict master.h NO_CXXMODULE LINKDEF masterLinkDef.h) +ROOTTEST_GENERATE_DICTIONARY(forwardDict forward.C NO_CXXMODULE LINKDEF linkdef.h) +ROOTTEST_GENERATE_DICTIONARY(constructorDict constructor.hh NO_CXXMODULE LINKDEF linkdef.h) +ROOTTEST_GENERATE_DICTIONARY(typenameTestDict typenameTest.C NO_CXXMODULE LINKDEF linkdef.h FIXTURES_SETUP cling-template-typenameTestDict-fixture) ROOTTEST_COMPILE_MACRO(usingtemplate.C diff --git a/roottest/cling/templateMembers/CMakeLists.txt b/roottest/cling/templateMembers/CMakeLists.txt index 74cf737125cc1..d7f86aa824af0 100644 --- a/roottest/cling/templateMembers/CMakeLists.txt +++ b/roottest/cling/templateMembers/CMakeLists.txt @@ -27,7 +27,7 @@ ROOTTEST_ADD_TEST(runConstructor FIXTURES_REQUIRED cling-templateMembers-constructor-fixture LABELS roottest regression cling) -ROOTTEST_GENERATE_DICTIONARY(opdict operator.C LINKDEF linkdef.h) +ROOTTEST_GENERATE_DICTIONARY(opdict operator.C NO_CXXMODULE LINKDEF linkdef.h) ROOTTEST_GENERATE_DICTIONARY(libtemplateMembersDict templateMembersClasses.h