From d0a57592a1b04e3e91cc76ed32d03999b64c40f8 Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Mon, 11 Aug 2025 10:42:39 +0200 Subject: [PATCH 1/4] [roottest] convert to cmake meta/ROOT-7181 tests Like in cmsUnload, provide special runscript.C which loads commands and invoke them one by one. --- roottest/root/meta/ROOT-7181/.rootrc | 2 - roottest/root/meta/ROOT-7181/CMakeLists.txt | 52 ++++++++++++++--- roottest/root/meta/ROOT-7181/Makefile | 57 ------------------- roottest/root/meta/ROOT-7181/case1.ref | 1 + roottest/root/meta/ROOT-7181/case2.ref | 1 + roottest/root/meta/ROOT-7181/case3.ref | 1 + roottest/root/meta/ROOT-7181/case4.ref | 1 + roottest/root/meta/ROOT-7181/rmap-case1.ref | 2 +- roottest/root/meta/ROOT-7181/rmap-case2.ref | 2 +- roottest/root/meta/ROOT-7181/rmap-case3.ref | 2 +- roottest/root/meta/ROOT-7181/rmap-case4.ref | 2 +- roottest/root/meta/ROOT-7181/runscript.C | 28 +++++++++ .../root/meta/ROOT-7181/scripts/case1.script | 4 +- .../root/meta/ROOT-7181/scripts/case2.script | 4 +- .../root/meta/ROOT-7181/scripts/case3.script | 4 +- .../root/meta/ROOT-7181/scripts/case4.script | 4 +- .../root/meta/ROOT-7181/scripts/loadrootmap.C | 8 --- 17 files changed, 88 insertions(+), 87 deletions(-) delete mode 100644 roottest/root/meta/ROOT-7181/.rootrc delete mode 100644 roottest/root/meta/ROOT-7181/Makefile create mode 100644 roottest/root/meta/ROOT-7181/runscript.C delete mode 100644 roottest/root/meta/ROOT-7181/scripts/loadrootmap.C diff --git a/roottest/root/meta/ROOT-7181/.rootrc b/roottest/root/meta/ROOT-7181/.rootrc deleted file mode 100644 index 84c31bb3db13d..0000000000000 --- a/roottest/root/meta/ROOT-7181/.rootrc +++ /dev/null @@ -1,2 +0,0 @@ -Rint.History: .root_hist -ACLiC.LinkLibs: 1 diff --git a/roottest/root/meta/ROOT-7181/CMakeLists.txt b/roottest/root/meta/ROOT-7181/CMakeLists.txt index 182629f9610bb..3e9609e2bdfbe 100644 --- a/roottest/root/meta/ROOT-7181/CMakeLists.txt +++ b/roottest/root/meta/ROOT-7181/CMakeLists.txt @@ -1,8 +1,44 @@ -#------------------------------------------------------------------------------- -# -# Placeholder file to translate the tests to the new CTest system. Meanwhile we -# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR} -# -#------------------------------------------------------------------------------- - -ROOTTEST_ADD_OLDTEST() +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc) + +ROOTTEST_GENERATE_REFLEX_DICTIONARY(btag + inc/BTagVertex_v1.h + SELECTION inc/btag_selection.xml + FIXTURES_SETUP root-meta-7181-btag-fixture) + +ROOTTEST_GENERATE_REFLEX_DICTIONARY(jet + inc/Jet_v1.h + SELECTION inc/jet_selection.xml + FIXTURES_SETUP root-meta-7181-jet-fixture) + +ROOTTEST_GENERATE_REFLEX_DICTIONARY(sjet + inc/SJet_v1.h + SELECTION inc/sjet_selection.xml + FIXTURES_SETUP root-meta-7181-sjet-fixture) + +macro(ROOT_7181_TEST name use_rmap) + if(${use_rmap} STREQUAL "true") + set(testname rmap-${name}) + else() + set(testname ${name}) + endif() + + ROOTTEST_ADD_TEST(${testname} + MACRO runscript.C + MACROARG "\"${CMAKE_CURRENT_SOURCE_DIR}/scripts/${name}.script\",${use_rmap}" + ROOTEXE_OPTS -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}\")" + -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}/inc\")" + OUTREF ${testname}.ref + FIXTURES_REQUIRED root-meta-7181-btag-fixture + root-meta-7181-jet-fixture + root-meta-7181-sjet-fixture) +endmacro(ROOT_7181_TEST) + +ROOT_7181_TEST(case1 false) +ROOT_7181_TEST(case2 false) +ROOT_7181_TEST(case3 false) +ROOT_7181_TEST(case4 false) + +ROOT_7181_TEST(case1 true) +ROOT_7181_TEST(case2 true) +ROOT_7181_TEST(case3 true) +ROOT_7181_TEST(case4 true) diff --git a/roottest/root/meta/ROOT-7181/Makefile b/roottest/root/meta/ROOT-7181/Makefile deleted file mode 100644 index ba736d68ad8df..0000000000000 --- a/roottest/root/meta/ROOT-7181/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -ALL_CASES = case1 case2 case3 case4 -ALL_ROOTMAP_CASES = $(addprefix rmap-,$(ALL_CASES)) - -CLEAN_TARGETS += *.log dummy* *pcm *o *rflx.* $(ALL_LIBRARIES) \ - obj/* lib/* -TEST_TARGETS += execLoadLibs $(ALL_CASES) $(ALL_ROOTMAP_CASES) - -ifeq ($(strip $(ROOTTEST_HOME)),) - export ROOTTEST_HOME := $(shell git rev-parse --show-toplevel)/roottest/ - ifeq ($(strip $(ROOTTEST_HOME)),) - export ROOTTEST_HOME := $(shell expr $(CURDIR) : '\(.*/roottest/\)') - endif - ifeq ($(strip $(ROOTTEST_HOME)),) - $(error The head of roottest was not found. Set ROOTTEST_HOME) - endif -endif - -include $(ROOTTEST_HOME)/scripts/Rules.mk -include $(ROOTTEST_HOME)/scripts/Reflex.mk - -obj/jet_dict.cxx: inc/jet_selection.xml inc/Jet_v1.h inc/DataVector.h - $(CMDECHO) mkdir -p obj lib && genreflex inc/Jet_v1.h --output obj/jet_dict.cxx -l lib/libjet.so -s inc/jet_selection.xml --rootmap lib/libjet.rootmap -Iinc - -obj/sjet_dict.cxx: inc/sjet_selection.xml inc/SJet_v1.h inc/DataVector.h - $(CMDECHO) mkdir -p obj lib && genreflex inc/SJet_v1.h --output obj/sjet_dict.cxx -l lib/libsjet.so -s inc/sjet_selection.xml --rootmap lib/libsjet.rootmap -Iinc - -obj/btag_dict.cxx: inc/btag_selection.xml inc/BTagVertex_v1.h inc/DataVector.h - $(CMDECHO) mkdir -p obj lib && genreflex inc/BTagVertex_v1.h --output obj/btag_dict.cxx -l lib/libbtag.so -s inc/btag_selection.xml --rootmap lib/libbtag.rootmap -Iinc - - -lib/libjet.$(DllSuf): obj/jet_dict.$(ObjSuf) - $(BuildFromObj) - -lib/libsjet.$(DllSuf): obj/sjet_dict.$(ObjSuf) - $(BuildFromObj) - -lib/libbtag.$(DllSuf): obj/btag_dict.$(ObjSuf) - $(BuildFromObj) - -$(ALL_CASES) : %: %.success -$(ALL_ROOTMAP_CASES) : %: %.success - -ALL_CASES_LOG = $(addsuffix .log,$(ALL_CASES)) -ALL_ROOTMAP_CASES_LOG = $(addsuffix .log,$(ALL_ROOTMAP_CASES)) - -$(addsuffix .success,$(ALL_CASES) $(ALL_ROOTMAP_CASES)) : %.success: %.log %.ref - $(SuccessTestDiff) && touch $@ - - -$(ALL_CASES_LOG): %.log: scripts/%.script lib/libjet.$(DllSuf) lib/libbtag.$(DllSuf) lib/libsjet.$(DllSuf) $(UTILS_PREREQ) $(ROOTCORELIBS) $(ROOTCINT) $(ROOTV) - $(CMDECHO) $(CALLROOTEXE) -l -b < $< > $@ 2>&1 || handleError.sh --cmd='Execution of $<' --result=$$? --log=$@ --test=$* - -$(ALL_ROOTMAP_CASES_LOG): rmap-%.log: scripts/%.script lib/libjet.$(DllSuf) lib/libbtag.$(DllSuf) lib/libsjet.$(DllSuf) $(UTILS_PREREQ) $(ROOTCORELIBS) $(ROOTCINT) $(ROOTV) - $(CMDECHO) $(CALLROOTEXE) -l -b scripts/loadrootmap.C < $< > $@ 2>&1 || handleError.sh --cmd='Execution of $<' --result=$$? --log=$@ --test=$* - - - diff --git a/roottest/root/meta/ROOT-7181/case1.ref b/roottest/root/meta/ROOT-7181/case1.ref index 254b61f0be9df..4de6c68a33935 100644 --- a/roottest/root/meta/ROOT-7181/case1.ref +++ b/roottest/root/meta/ROOT-7181/case1.ref @@ -1,2 +1,3 @@ +Processing runscript.C("scripts/case1.script",false)... Classinfo for DataVector is valid diff --git a/roottest/root/meta/ROOT-7181/case2.ref b/roottest/root/meta/ROOT-7181/case2.ref index 0d0b2a7145ad4..45b99f628043f 100644 --- a/roottest/root/meta/ROOT-7181/case2.ref +++ b/roottest/root/meta/ROOT-7181/case2.ref @@ -1,2 +1,3 @@ +Processing runscript.C("scripts/case2.script",false)... Classinfo for SDataVector is valid diff --git a/roottest/root/meta/ROOT-7181/case3.ref b/roottest/root/meta/ROOT-7181/case3.ref index f72e441106768..695377fa0dfb3 100644 --- a/roottest/root/meta/ROOT-7181/case3.ref +++ b/roottest/root/meta/ROOT-7181/case3.ref @@ -1,2 +1,3 @@ +Processing runscript.C("scripts/case3.script",false)... TClass for DataVector is loaded diff --git a/roottest/root/meta/ROOT-7181/case4.ref b/roottest/root/meta/ROOT-7181/case4.ref index 995ac8e45c649..e944d63a16135 100644 --- a/roottest/root/meta/ROOT-7181/case4.ref +++ b/roottest/root/meta/ROOT-7181/case4.ref @@ -1,2 +1,3 @@ +Processing runscript.C("scripts/case4.script",false)... Normalized name for DataVector is : DataVector > diff --git a/roottest/root/meta/ROOT-7181/rmap-case1.ref b/roottest/root/meta/ROOT-7181/rmap-case1.ref index 5689528baca7e..5926a5ed1338c 100644 --- a/roottest/root/meta/ROOT-7181/rmap-case1.ref +++ b/roottest/root/meta/ROOT-7181/rmap-case1.ref @@ -1,3 +1,3 @@ -Processing scripts/loadrootmap.C... +Processing runscript.C("scripts/case1.script",true)... Classinfo for DataVector is valid diff --git a/roottest/root/meta/ROOT-7181/rmap-case2.ref b/roottest/root/meta/ROOT-7181/rmap-case2.ref index 03a90ffbc68eb..5977840320989 100644 --- a/roottest/root/meta/ROOT-7181/rmap-case2.ref +++ b/roottest/root/meta/ROOT-7181/rmap-case2.ref @@ -1,3 +1,3 @@ -Processing scripts/loadrootmap.C... +Processing runscript.C("scripts/case2.script",true)... Classinfo for SDataVector is valid diff --git a/roottest/root/meta/ROOT-7181/rmap-case3.ref b/roottest/root/meta/ROOT-7181/rmap-case3.ref index 75adadeed4c81..d055793a817f3 100644 --- a/roottest/root/meta/ROOT-7181/rmap-case3.ref +++ b/roottest/root/meta/ROOT-7181/rmap-case3.ref @@ -1,3 +1,3 @@ -Processing scripts/loadrootmap.C... +Processing runscript.C("scripts/case3.script",true)... TClass for DataVector is loaded diff --git a/roottest/root/meta/ROOT-7181/rmap-case4.ref b/roottest/root/meta/ROOT-7181/rmap-case4.ref index f5c2ce19b3663..589770da3b73e 100644 --- a/roottest/root/meta/ROOT-7181/rmap-case4.ref +++ b/roottest/root/meta/ROOT-7181/rmap-case4.ref @@ -1,3 +1,3 @@ -Processing scripts/loadrootmap.C... +Processing runscript.C("scripts/case4.script",true)... Normalized name for DataVector is : DataVector > diff --git a/roottest/root/meta/ROOT-7181/runscript.C b/roottest/root/meta/ROOT-7181/runscript.C new file mode 100644 index 0000000000000..a0b18024a56e8 --- /dev/null +++ b/roottest/root/meta/ROOT-7181/runscript.C @@ -0,0 +1,28 @@ +#include +#include +#include +#include + +void runscript(const char *fname, bool with_rootmap = false) +{ + if (with_rootmap) { + int old = gInterpreter->SetClassAutoloading(kFALSE); + gInterpreter->LoadLibraryMap("libbtag.rootmap"); + gInterpreter->LoadLibraryMap("libjet.rootmap"); + gInterpreter->LoadLibraryMap("libsjet.rootmap"); + gInterpreter->SetClassAutoloading(old); + } + + std::ifstream f(fname); + if (!f) { + std::cout << "Not able to open " << fname << std::endl; + return; + } + + std::string line; + while (std::getline(f, line)) { + // std::cout << "Process: " << line << std::endl; + gROOT->ProcessLine(line.c_str()); + } +} + diff --git a/roottest/root/meta/ROOT-7181/scripts/case1.script b/roottest/root/meta/ROOT-7181/scripts/case1.script index 05272158cc514..08fdc8d02cd40 100644 --- a/roottest/root/meta/ROOT-7181/scripts/case1.script +++ b/roottest/root/meta/ROOT-7181/scripts/case1.script @@ -1,5 +1,5 @@ -.L lib/libjet.so -.L lib/libbtag.so +gSystem->Load("libjet_dictrflx"); +gSystem->Load("libbtag_dictrflx"); #include "DataVector.h" TClass::GetClass("SG::AuxTypeVectorFactory > > >"); auto c = TClass::GetClass("DataVector")->GetClassInfo(); diff --git a/roottest/root/meta/ROOT-7181/scripts/case2.script b/roottest/root/meta/ROOT-7181/scripts/case2.script index 187e5c72d02ef..4e2035e8426a0 100644 --- a/roottest/root/meta/ROOT-7181/scripts/case2.script +++ b/roottest/root/meta/ROOT-7181/scripts/case2.script @@ -1,5 +1,5 @@ -.L lib/libsjet.so -.L lib/libbtag.so +gSystem->Load("libsjet_dictrflx"); +gSystem->Load("libbtag_dictrflx"); #include "DataVector.h" TClass::GetClass("SG::AuxTypeVectorFactory > > >"); auto c = TClass::GetClass("SDataVector")->GetClassInfo(); diff --git a/roottest/root/meta/ROOT-7181/scripts/case3.script b/roottest/root/meta/ROOT-7181/scripts/case3.script index ed02144391419..e0162946fb8e0 100644 --- a/roottest/root/meta/ROOT-7181/scripts/case3.script +++ b/roottest/root/meta/ROOT-7181/scripts/case3.script @@ -1,5 +1,5 @@ -.L lib/libjet.so -.L lib/libbtag.so +gSystem->Load("libjet_dictrflx"); +gSystem->Load("libbtag_dictrflx"); #include "DataVector.h" auto c = TClass::GetClass("DataVector"); printf("TClass for DataVector is %s\n",c->IsLoaded() ? "loaded" : "not loaded"); diff --git a/roottest/root/meta/ROOT-7181/scripts/case4.script b/roottest/root/meta/ROOT-7181/scripts/case4.script index 9c3e85a5a0105..0e48b22c33369 100644 --- a/roottest/root/meta/ROOT-7181/scripts/case4.script +++ b/roottest/root/meta/ROOT-7181/scripts/case4.script @@ -1,5 +1,5 @@ -.L lib/libjet.so -.L lib/libbtag.so +gSystem->Load("libjet_dictrflx"); +gSystem->Load("libbtag_dictrflx"); #include "DataVector.h" DataVector obj; diff --git a/roottest/root/meta/ROOT-7181/scripts/loadrootmap.C b/roottest/root/meta/ROOT-7181/scripts/loadrootmap.C deleted file mode 100644 index e7807d5118489..0000000000000 --- a/roottest/root/meta/ROOT-7181/scripts/loadrootmap.C +++ /dev/null @@ -1,8 +0,0 @@ -{ -int old = gInterpreter->SetClassAutoloading(kFALSE); -gInterpreter->LoadLibraryMap("lib/libbtag.rootmap"); -gInterpreter->LoadLibraryMap("lib/libjet.rootmap"); -gInterpreter->LoadLibraryMap("lib/libsjet.rootmap"); -gInterpreter->SetClassAutoloading(old); -} - From fd0ceae5cf56762bd4a010a9684959e516a39ced Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Wed, 20 Aug 2025 10:26:20 +0200 Subject: [PATCH 2/4] [rottest] remove unused code --- roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h b/roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h index 60a061c2678f8..94ab4704b5663 100644 --- a/roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h +++ b/roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h @@ -20,19 +20,4 @@ namespace xAOD { typedef DataVector BTaggingContainer_v1; } -#if 0 -template <> struct DataVectorBase -{ - typedef DataVector Base; - int fBtag; -}; - -template <> struct DataVectorBase -{ - typedef DataVector Base; - int fBtagging; -}; - -#endif - #endif From 6f822db5a9378606d60191ee55e44984d3ca8330 Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Fri, 22 Aug 2025 14:37:42 +0200 Subject: [PATCH 3/4] [roottest] move text scripts into runscript.C Use of ProcessLine does not work on CI nodes --- roottest/root/meta/ROOT-7181/CMakeLists.txt | 2 +- roottest/root/meta/ROOT-7181/runscript.C | 40 ++++++++++++++----- .../root/meta/ROOT-7181/scripts/case1.script | 6 --- .../root/meta/ROOT-7181/scripts/case2.script | 7 ---- .../root/meta/ROOT-7181/scripts/case3.script | 7 ---- .../root/meta/ROOT-7181/scripts/case4.script | 12 ------ 6 files changed, 30 insertions(+), 44 deletions(-) delete mode 100644 roottest/root/meta/ROOT-7181/scripts/case1.script delete mode 100644 roottest/root/meta/ROOT-7181/scripts/case2.script delete mode 100644 roottest/root/meta/ROOT-7181/scripts/case3.script delete mode 100644 roottest/root/meta/ROOT-7181/scripts/case4.script diff --git a/roottest/root/meta/ROOT-7181/CMakeLists.txt b/roottest/root/meta/ROOT-7181/CMakeLists.txt index 3e9609e2bdfbe..ccff070702635 100644 --- a/roottest/root/meta/ROOT-7181/CMakeLists.txt +++ b/roottest/root/meta/ROOT-7181/CMakeLists.txt @@ -24,7 +24,7 @@ macro(ROOT_7181_TEST name use_rmap) ROOTTEST_ADD_TEST(${testname} MACRO runscript.C - MACROARG "\"${CMAKE_CURRENT_SOURCE_DIR}/scripts/${name}.script\",${use_rmap}" + MACROARG "\"${name}\",${use_rmap}" ROOTEXE_OPTS -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}\")" -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}/inc\")" OUTREF ${testname}.ref diff --git a/roottest/root/meta/ROOT-7181/runscript.C b/roottest/root/meta/ROOT-7181/runscript.C index a0b18024a56e8..022ea583c0ec8 100644 --- a/roottest/root/meta/ROOT-7181/runscript.C +++ b/roottest/root/meta/ROOT-7181/runscript.C @@ -3,7 +3,10 @@ #include #include -void runscript(const char *fname, bool with_rootmap = false) + +#include "DataVector.h" + +void runscript(const std::string &name, bool with_rootmap = false) { if (with_rootmap) { int old = gInterpreter->SetClassAutoloading(kFALSE); @@ -13,16 +16,31 @@ void runscript(const char *fname, bool with_rootmap = false) gInterpreter->SetClassAutoloading(old); } - std::ifstream f(fname); - if (!f) { - std::cout << "Not able to open " << fname << std::endl; - return; - } - - std::string line; - while (std::getline(f, line)) { - // std::cout << "Process: " << line << std::endl; - gROOT->ProcessLine(line.c_str()); + if (name == "case1") { + gSystem->Load("libjet_dictrflx"); + gSystem->Load("libbtag_dictrflx"); + TClass::GetClass("SG::AuxTypeVectorFactory > > >"); + auto c = TClass::GetClass("DataVector")->GetClassInfo(); + printf("Classinfo for DataVector is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid"); + } else if (name == "case2") { + gSystem->Load("libsjet_dictrflx"); + gSystem->Load("libbtag_dictrflx"); + TClass::GetClass("SG::AuxTypeVectorFactory > > >"); + auto c = TClass::GetClass("SDataVector")->GetClassInfo(); + printf("Classinfo for SDataVector is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid"); + } else if (name == "case3") { + gSystem->Load("libjet_dictrflx"); + gSystem->Load("libbtag_dictrflx"); + auto c = TClass::GetClass("DataVector"); + printf("TClass for DataVector is %s\n",c->IsLoaded() ? "loaded" : "not loaded"); + } else if (name == "case4") { + gSystem->Load("libjet_dictrflx"); + gSystem->Load("libbtag_dictrflx"); + gROOT->ProcessLine("DataVector obj;"); + std::string name; + TClassEdit::GetNormalizedName(name,"DataVector"); + // TClass::GetClass("DataVector"); + printf("Normalized name for DataVector is : %s\n",name.c_str()); } } diff --git a/roottest/root/meta/ROOT-7181/scripts/case1.script b/roottest/root/meta/ROOT-7181/scripts/case1.script deleted file mode 100644 index 08fdc8d02cd40..0000000000000 --- a/roottest/root/meta/ROOT-7181/scripts/case1.script +++ /dev/null @@ -1,6 +0,0 @@ -gSystem->Load("libjet_dictrflx"); -gSystem->Load("libbtag_dictrflx"); -#include "DataVector.h" -TClass::GetClass("SG::AuxTypeVectorFactory > > >"); -auto c = TClass::GetClass("DataVector")->GetClassInfo(); -printf("Classinfo for DataVector is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid"); diff --git a/roottest/root/meta/ROOT-7181/scripts/case2.script b/roottest/root/meta/ROOT-7181/scripts/case2.script deleted file mode 100644 index 4e2035e8426a0..0000000000000 --- a/roottest/root/meta/ROOT-7181/scripts/case2.script +++ /dev/null @@ -1,7 +0,0 @@ -gSystem->Load("libsjet_dictrflx"); -gSystem->Load("libbtag_dictrflx"); -#include "DataVector.h" -TClass::GetClass("SG::AuxTypeVectorFactory > > >"); -auto c = TClass::GetClass("SDataVector")->GetClassInfo(); -printf("Classinfo for SDataVector is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid"); - diff --git a/roottest/root/meta/ROOT-7181/scripts/case3.script b/roottest/root/meta/ROOT-7181/scripts/case3.script deleted file mode 100644 index e0162946fb8e0..0000000000000 --- a/roottest/root/meta/ROOT-7181/scripts/case3.script +++ /dev/null @@ -1,7 +0,0 @@ -gSystem->Load("libjet_dictrflx"); -gSystem->Load("libbtag_dictrflx"); -#include "DataVector.h" -auto c = TClass::GetClass("DataVector"); -printf("TClass for DataVector is %s\n",c->IsLoaded() ? "loaded" : "not loaded"); - - diff --git a/roottest/root/meta/ROOT-7181/scripts/case4.script b/roottest/root/meta/ROOT-7181/scripts/case4.script deleted file mode 100644 index 0e48b22c33369..0000000000000 --- a/roottest/root/meta/ROOT-7181/scripts/case4.script +++ /dev/null @@ -1,12 +0,0 @@ -gSystem->Load("libjet_dictrflx"); -gSystem->Load("libbtag_dictrflx"); -#include "DataVector.h" -DataVector obj; - -std::string name; -TClassEdit::GetNormalizedName(name,"DataVector"); - -// TClass::GetClass("DataVector"); - -printf("Normalized name for DataVector is : %s\n",name.c_str()); - From ff2e0514ed8ef4ea4f8d3ee812af73c256876695 Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Thu, 13 Nov 2025 14:20:31 +0100 Subject: [PATCH 4/4] [roottest] fix ROT-7181 add missing entries in dictionary and use fully-qualified template class Actually it should not be required, by clang complains --- roottest/root/meta/ROOT-7181/inc/jet_selection.xml | 5 +++++ roottest/root/meta/ROOT-7181/runscript.C | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/roottest/root/meta/ROOT-7181/inc/jet_selection.xml b/roottest/root/meta/ROOT-7181/inc/jet_selection.xml index 82e592d55f937..0e23a3c127eb4 100644 --- a/roottest/root/meta/ROOT-7181/inc/jet_selection.xml +++ b/roottest/root/meta/ROOT-7181/inc/jet_selection.xml @@ -27,6 +27,11 @@ + + + + +