Skip to content

Commit 0c30dfd

Browse files
committed
[roottest] Fix cpp11containers fixtures
The Names test depends on all other tests in the directory since it uses forward_list, set, and map.
1 parent 9bc14ef commit 0c30dfd

1 file changed

Lines changed: 22 additions & 17 deletions

File tree

roottest/root/io/cpp11Containers/CMakeLists.txt

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
ROOTTEST_GENERATE_REFLEX_DICTIONARY(unorderedMap
2+
unorderedMap.h
3+
SELECTION unorderedMap_selection.xml
4+
FIXTURES_SETUP root-io-cpp11Containers-unorderedMapDict-fixture)
5+
6+
ROOTTEST_ADD_TEST(unorderedMap
7+
MACRO execUnorderedMap.C
8+
OUTREF execUnorderedMap.ref
9+
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedMapDict-fixture
10+
FIXTURES_SETUP root-io-cpp11Containers-unorderedMap-fixture
11+
LABELS longtest)
12+
113
if(NOT 32BIT AND NOT MSVC)
214
ROOTTEST_GENERATE_REFLEX_DICTIONARY(forwardList
315
forwardList.h
@@ -19,23 +31,16 @@ if(NOT 32BIT AND NOT MSVC)
1931
MACRO execUnorderedSet.C
2032
OUTREF execUnorderedSet.ref
2133
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedSetDict-fixture
22-
root-io-cpp11Containers-forwardList-fixture)
23-
endif()
34+
root-io-cpp11Containers-forwardList-fixture
35+
FIXTURES_SETUP root-io-cpp11Containers-unorderedSet-fixture)
2436

25-
ROOTTEST_GENERATE_REFLEX_DICTIONARY(unorderedMap
26-
unorderedMap.h
27-
SELECTION unorderedMap_selection.xml
28-
FIXTURES_SETUP root-io-cpp11Containers-unorderedMapDict-fixture)
37+
ROOTTEST_ADD_TEST(Names
38+
COPY_TO_BUILDDIR auxCode.h commonUtils.h
39+
MACRO execcpp11ContainersNames.C
40+
OUTREF execcpp11ContainersNames.ref
41+
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedSet-fixture
42+
root-io-cpp11Containers-forwardList-fixture
43+
root-io-cpp11Containers-unorderedMap-fixture)
44+
endif()
2945

30-
ROOTTEST_ADD_TEST(unorderedMap
31-
MACRO execUnorderedMap.C
32-
OUTREF execUnorderedMap.ref
33-
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedMapDict-fixture
34-
FIXTURES_SETUP root-io-cpp11Containers-unorderedMap-fixture
35-
LABELS longtest)
3646

37-
ROOTTEST_ADD_TEST(Names
38-
COPY_TO_BUILDDIR auxCode.h commonUtils.h
39-
MACRO execcpp11ContainersNames.C
40-
OUTREF execcpp11ContainersNames.ref
41-
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedMap-fixture)

0 commit comments

Comments
 (0)