Skip to content

Improve cpp11containers test configuration #22909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vepadulano wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −25
Open

Improve cpp11containers test configuration #22909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a4b576
[roottest] Deduplicate selected classes in test
vepadulano Jul 24, 2026
4771f94
[roottest] Fix cpp11containers fixtures
vepadulano Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions roottest/root/io/cpp11Containers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
ROOTTEST_GENERATE_REFLEX_DICTIONARY(unorderedMap
unorderedMap.h
SELECTION unorderedMap_selection.xml
FIXTURES_SETUP root-io-cpp11Containers-unorderedMapDict-fixture)

ROOTTEST_ADD_TEST(unorderedMap
MACRO execUnorderedMap.C
OUTREF execUnorderedMap.ref
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedMapDict-fixture
FIXTURES_SETUP root-io-cpp11Containers-unorderedMap-fixture
LABELS longtest)

if(NOT 32BIT AND NOT MSVC)
ROOTTEST_GENERATE_REFLEX_DICTIONARY(forwardList
forwardList.h
Expand All @@ -19,23 +31,16 @@ if(NOT 32BIT AND NOT MSVC)
MACRO execUnorderedSet.C
OUTREF execUnorderedSet.ref
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedSetDict-fixture
root-io-cpp11Containers-forwardList-fixture)
endif()
root-io-cpp11Containers-forwardList-fixture
FIXTURES_SETUP root-io-cpp11Containers-unorderedSet-fixture)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(unorderedMap
unorderedMap.h
SELECTION unorderedMap_selection.xml
FIXTURES_SETUP root-io-cpp11Containers-unorderedMapDict-fixture)
ROOTTEST_ADD_TEST(Names
COPY_TO_BUILDDIR auxCode.h commonUtils.h
MACRO execcpp11ContainersNames.C
OUTREF execcpp11ContainersNames.ref
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedSet-fixture
root-io-cpp11Containers-forwardList-fixture
root-io-cpp11Containers-unorderedMap-fixture)
endif()

ROOTTEST_ADD_TEST(unorderedMap
MACRO execUnorderedMap.C
OUTREF execUnorderedMap.ref
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedMapDict-fixture
FIXTURES_SETUP root-io-cpp11Containers-unorderedMap-fixture
LABELS longtest)

ROOTTEST_ADD_TEST(Names
COPY_TO_BUILDDIR auxCode.h commonUtils.h
MACRO execcpp11ContainersNames.C
OUTREF execcpp11ContainersNames.ref
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedMap-fixture)
8 changes: 0 additions & 8 deletions roottest/root/io/cpp11Containers/unorderedMap_selection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

<class name="std::multimap<int,double>" />
<class name="std::multimap<int,TH1F>" />
<class name="std::multimap<int,double>" />
<!-- Here the veco of conts and conts of vec -->
<class name="std::vector<multimap<int,TH1F>>" />
<class name="std::multimap<int,vector<TH1F>>" />
Expand All @@ -20,7 +19,6 @@

<class name="std::unordered_multimap<int,double>" />
<class name="std::unordered_multimap<int,TH1F>" />
<class name="std::unordered_multimap<int,double>" />
<!-- Here the veco of conts and conts of vec -->
<class name="std::vector<unordered_multimap<int,TH1F>>" />
<class name="std::unordered_multimap<int,vector<TH1F>>" />
Expand All @@ -34,7 +32,6 @@

<class name="std::multimap<Long64_t,double>" />
<class name="std::multimap<Long64_t,TH1F>" />
<class name="std::multimap<Long64_t,double>" />
<!-- Here the veco of conts and conts of vec -->
<class name="std::vector<multimap<Long64_t,TH1F>>" />
<class name="std::multimap<Long64_t,vector<TH1F>>" />
Expand All @@ -47,7 +44,6 @@

<class name="std::unordered_multimap<Long64_t,double>" />
<class name="std::unordered_multimap<Long64_t,TH1F>" />
<class name="std::unordered_multimap<Long64_t,double>" />
<!-- Here the veco of conts and conts of vec -->
<class name="std::vector<unordered_multimap<Long64_t,TH1F>>" />
<class name="std::unordered_multimap<Long64_t,vector<TH1F>>" />
Expand All @@ -60,7 +56,6 @@

<class name="std::multimap<float,double>" />
<class name="std::multimap<float,TH1F>" />
<class name="std::multimap<float,double>" />
<!-- Here the veco of conts and conts of vec -->
<class name="std::vector<multimap<float,TH1F>>" />
<class name="std::multimap<float,vector<TH1F>>" />
Expand All @@ -73,7 +68,6 @@

<class name="std::unordered_multimap<float,double>" />
<class name="std::unordered_multimap<float,TH1F>" />
<class name="std::unordered_multimap<float,double>" />
<!-- Here the veco of conts and conts of vec -->
<class name="std::vector<unordered_multimap<float,TH1F>>" />
<class name="std::unordered_multimap<float,vector<TH1F>>" />
Expand All @@ -86,7 +80,6 @@

<class name="std::multimap<double,double>" />
<class name="std::multimap<double,TH1F>" />
<class name="std::multimap<double,double>" />
<!-- Here the veco of conts and conts of vec -->
<class name="std::vector<multimap<double,TH1F>>" />
<class name="std::multimap<double,vector<TH1F>>" />
Expand All @@ -99,7 +92,6 @@

<class name="std::unordered_multimap<double,double>" />
<class name="std::unordered_multimap<double,TH1F>" />
<class name="std::unordered_multimap<double,double>" />
<!-- Here the veco of conts and conts of vec -->
<class name="std::vector<unordered_multimap<double,TH1F>>" />
<class name="std::unordered_multimap<double,vector<TH1F>>" />
Expand Down
Loading