From 0a4b576440baffa4b8f8002a617c698bdd149e44 Mon Sep 17 00:00:00 2001
From: Vincenzo Eduardo Padulano <vincenzo.eduardo.padulano@cern.ch>
Date: Fri, 24 Jul 2026 11:04:38 +0200
Subject: [PATCH 1/2] [roottest] Deduplicate selected classes in test

---
 .../root/io/cpp11Containers/unorderedMap_selection.xml    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/roottest/root/io/cpp11Containers/unorderedMap_selection.xml b/roottest/root/io/cpp11Containers/unorderedMap_selection.xml
index ba5116d82ca19..7959651a0d2e5 100644
--- a/roottest/root/io/cpp11Containers/unorderedMap_selection.xml
+++ b/roottest/root/io/cpp11Containers/unorderedMap_selection.xml
@@ -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>>" />
@@ -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>>" />
@@ -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>>" />
@@ -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>>" />
@@ -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>>" />
@@ -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>>" />
@@ -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>>" />
@@ -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>>" />

From 4771f94e857f5713be41f15a4aa9741263edd58a Mon Sep 17 00:00:00 2001
From: Vincenzo Eduardo Padulano <vincenzo.eduardo.padulano@cern.ch>
Date: Fri, 24 Jul 2026 12:04:50 +0200
Subject: [PATCH 2/2] [roottest] Fix cpp11containers fixtures

The Names test depends on all other tests in the directory since it uses forward_list, set, and map.
---
 .../root/io/cpp11Containers/CMakeLists.txt    | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/roottest/root/io/cpp11Containers/CMakeLists.txt b/roottest/root/io/cpp11Containers/CMakeLists.txt
index c5d88a0ac6cf5..086779fa44b5a 100644
--- a/roottest/root/io/cpp11Containers/CMakeLists.txt
+++ b/roottest/root/io/cpp11Containers/CMakeLists.txt
@@ -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
@@ -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)