Skip to content

Commit f1d759d

Browse files
committed
[roottest] use fixtures in root/meta/tclass tests
Clarify dependencies for ctest
1 parent e200aff commit f1d759d

File tree

2 files changed

+38
-19
lines changed

2 files changed

+38
-19
lines changed

roottest/root/meta/tclass/.rootrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

roottest/root/meta/tclass/CMakeLists.txt

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,47 @@ ROOTTEST_ADD_TEST(execBrowseNonAccessibleType
33
MACRO execBrowseNonAccessibleType.C)
44

55
ROOTTEST_ADD_TEST(RunMyClass
6-
MACRO RunMyClass.C+)
6+
MACRO RunMyClass.C+
7+
FIXTURES_SETUP root-meta-tclass-RunMyClas-fixture)
78

89
ROOTTEST_ADD_TEST(runclassref
910
MACRO runclassref.C
1011
OUTREF classref.ref
11-
DEPENDS RunMyClass)
12+
FIXTURES_REQUIRED root-meta-tclass-RunMyClas-fixture)
13+
14+
ROOTTEST_COMPILE_MACRO(tempParse.C
15+
FIXTURES_SETUP root-meta-tclass-tempParse-fixture)
1216

1317
ROOTTEST_ADD_TEST(runtempParse
1418
MACRO runtempParse.C
1519
OUTREF tempParse.ref
16-
DEPENDS tempParse.C)
20+
FIXTURES_REQUIRED root-meta-tclass-tempParse-fixture)
1721

1822
ROOTTEST_ADD_TEST(runpairs
1923
COPY_TO_BUILDDIR pairs_v5.root
2024
MACRO runpairs.C+
2125
OUTREF pairs.ref)
2226

27+
ROOTTEST_COMPILE_MACRO(classlib.cxx
28+
FIXTURES_SETUP root-meta-tclass-classlib-fixture)
29+
2330
ROOTTEST_ADD_TEST(execInterpClassNew
2431
MACRO execInterpClassNew.C
2532
OUTREF execInterpClassNew.ref
26-
DEPENDS classlib.cxx)
33+
FIXTURES_REQUIRED root-meta-tclass-classlib-fixture)
2734

2835
ROOTTEST_ADD_TEST(execProperties
2936
MACRO execProperties.C
3037
OUTREF execProperties.ref)
3138

39+
ROOTTEST_COMPILE_MACRO(libState.cxx
40+
FIXTURES_SETUP root-meta-tclass-libState-fixture)
41+
3242
ROOTTEST_ADD_TEST(execState
33-
COPY_TO_BUILDDIR tc_state.root libState.cxx
43+
COPY_TO_BUILDDIR tc_state.root
3444
MACRO execState.C
3545
OUTREF execState.ref
36-
DEPENDS libState.cxx)
46+
FIXTURES_REQUIRED root-meta-tclass-libState-fixture)
3747

3848
ROOTTEST_ADD_TEST(execSharedPtr
3949
MACRO execSharedPtr.C
@@ -49,31 +59,40 @@ ROOTTEST_ADD_TEST(execTClassRehash
4959

5060
ROOTTEST_ADD_TEST(execTmpltD
5161
MACRO execTmpltD.cxx+
52-
OUTREF execTmpltD.ref)
62+
OUTREF execTmpltD.ref
63+
FIXTURES_SETUP root-meta-tclass-execTmpltD-fixture)
5364

5465
ROOTTEST_ADD_TEST(execTmpltD32
5566
MACRO execTmpltD32.cxx+
56-
OUTREF execTmpltD32.ref)
67+
OUTREF execTmpltD32.ref
68+
FIXTURES_SETUP root-meta-tclass-execTmpltD32-fixture)
5769

58-
ROOTTEST_COMPILE_MACRO(execReadTmplt.cxx)
70+
ROOTTEST_COMPILE_MACRO(execReadTmplt.cxx
71+
FIXTURES_SETUP root-meta-tclass-execReadTmplt-fixture)
5972

6073
ROOTTEST_ADD_TEST(execReadTmplt
6174
COPY_TO_BUILDDIR tmplt.h
6275
MACRO execReadTmplt.cxx+
6376
OUTREF execReadTmplt.ref
64-
DEPENDS ${COMPILE_MACRO_TEST} execTmpltD32 execTmpltD)
77+
FIXTURES_REQUIRED root-meta-tclass-execReadTmplt-fixture
78+
root-meta-tclass-execTmpltD-fixture
79+
root-meta-tclass-execTmpltD32-fixture)
6580

66-
ROOTTEST_GENERATE_REFLEX_DICTIONARY(SimpleVector simpleVector.h SELECTION simpleVector_selection.xml)
81+
ROOTTEST_GENERATE_REFLEX_DICTIONARY(SimpleVector simpleVector.h SELECTION simpleVector_selection.xml
82+
FIXTURES_SETUP root-meta-tclass-SimpleVector-fixture)
6783

6884
ROOTTEST_ADD_TEST(execSimpleVector
6985
MACRO execSimpleVector.C
7086
OUTREF execSimpleVector.ref
71-
DEPENDS ${GENERATE_REFLEX_TEST})
87+
FIXTURES_REQUIRED root-meta-tclass-SimpleVector-fixture)
88+
89+
ROOTTEST_COMPILE_MACRO(libDuplicate.cxx
90+
FIXTURES_SETUP root-meta-tclass-libDuplicate-fixture)
7291

7392
ROOTTEST_ADD_TEST(execDuplicate
7493
MACRO execDuplicate.C
7594
OUTREF execDuplicate.ref
76-
DEPENDS libDuplicate.cxx)
95+
FIXTURES_REQUIRED root-meta-tclass-libDuplicate-fixture)
7796

7897
ROOTTEST_ADD_TEST(execReadSimplePair
7998
COPY_TO_BUILDDIR simplepair.root
@@ -83,30 +102,31 @@ ROOTTEST_ADD_TEST(execReadSimplePair
83102
ROOTTEST_GENERATE_DICTIONARY(libdatamemberload
84103
datamemberload.h
85104
LINKDEF datamemberloadLinkDef.h
86-
NO_ROOTMAP NO_CXXMODULE)
105+
NO_ROOTMAP NO_CXXMODULE
106+
FIXTURES_SETUP root-meta-tclass-libdatamemberload-fixture)
87107

88108
ROOTTEST_ADD_TEST(datamemberload
89109
MACRO datamemberload.C
90110
COPY_TO_BUILDDIR datamemberload.h
91-
DEPENDS libdatamemberload-build)
111+
FIXTURES_REQUIRED root-meta-tclass-libdatamemberload-fixture)
92112

93113
ROOTTEST_GENERATE_DICTIONARY(libInitOrderDups
94114
InitOrderDups.h
95115
LINKDEF InitOrderDupsLinkDef.h
96116
NO_ROOTMAP NO_CXXMODULE
97-
FIXTURES_SETUP InitOrder)
117+
FIXTURES_SETUP root-meta-tclass-libInitOrderDups-fixture)
98118

99119
ROOTTEST_GENERATE_DICTIONARY(libInitOrder
100120
InitOrder.h
101121
LINKDEF InitOrderLinkDef.h
102122
NO_ROOTMAP NO_CXXMODULE
103-
FIXTURES_SETUP InitOrder)
123+
FIXTURES_SETUP root-meta-tclass-libInitOrder-fixture)
104124

105125
ROOTTEST_ADD_TEST(execInitOrder
106126
MACRO execInitOrder.cxx+
107127
COPY_TO_BUILDDIR InitOrder.h
108128
OUTREF execInitOrder.ref
109-
FIXTURES_REQUIRED InitOrder)
129+
FIXTURES_REQUIRED root-meta-tclass-libInitOrderDups-fixture root-meta-tclass-libInitOrder-fixture)
110130

111131
if(NOT coverage)
112132
ROOTTEST_ADD_TEST(tclassStl

0 commit comments

Comments
 (0)