Skip to content

Commit e9e7179

Browse files
committed
[roottest] adjust cmake for meta/tclass tests
Remove usedBits.C macro while it uses no longer exists TClass interface
1 parent d9d9a6d commit e9e7179

File tree

8 files changed

+23
-133
lines changed

8 files changed

+23
-133
lines changed

roottest/root/meta/tclass/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ ROOTTEST_ADD_TEST(execState
4747

4848
ROOTTEST_ADD_TEST(execSharedPtr
4949
MACRO execSharedPtr.C
50+
OUTREF execSharedPtr.ref
5051
ERRREF execSharedPtr.eref)
5152

5253
ROOTTEST_ADD_TEST(execMTInit
@@ -137,8 +138,8 @@ endif()
137138

138139
ROOTTEST_ADD_TEST(TClassAtTearDown
139140
MACRO execTClassAtTearDown.C
140-
COPY_TO_BUILDDIR empty.root
141-
OUTREF execTClassAtTearDown.ref)
141+
COPY_TO_BUILDDIR empty.root
142+
OUTREF execTClassAtTearDown.ref)
142143

143144
ROOTTEST_GENERATE_EXECUTABLE(TFileTearDown TFileTearDown.cxx
144145
LIBRARIES Core RIO Hist Rint

roottest/root/meta/tclass/Makefile

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11

22
Processing execSharedPtr.C...
3-
Error in <TClingCallFunc::exec>: The method get is called without an object.
4-
Error in <TClingCallFunc::exec>: Not enough arguments provided for operator= (0 instead of the minimum 1)
5-
Error in <TClingCallFunc::exec>: Not enough arguments provided for swap (0 instead of the minimum 1)
63
(int) 0
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
ROOTTEST_GENERATE_DICTIONARY(libRepro
2-
repro.h
3-
LINKDEF reproLinkDef.h
4-
NO_ROOTMAP NO_CXXMODULE)
2+
repro.h
3+
LINKDEF reproLinkDef.h
4+
NO_ROOTMAP NO_CXXMODULE
5+
FIXTURES_SETUP root-meta-tclass-6767-dict-fixture)
56

67
ROOTTEST_ADD_TEST(reproducer
78
MACRO repro.C
89
OUTREF repro.ref
9-
DEPENDS ${GENERATE_DICTIONARY_TEST})
10+
FIXTURES_REQUIRED root-meta-tclass-6767-dict-fixture)
Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
ROOTTEST_GENERATE_DICTIONARY(libPairs
2-
pairtest.h
3-
LINKDEF pairLinkDef.h
4-
NO_ROOTMAP NO_CXXMODULE)
5-
6-
ROOTTEST_ADD_TEST(pairCalculation
7-
MACRO execPair.C
8-
OUTREF execPair.ref
9-
DEPENDS libPairs-build pairWriteFile)
2+
pairtest.h
3+
LINKDEF pairLinkDef.h
4+
NO_ROOTMAP NO_CXXMODULE
5+
FIXTURES_SETUP root-meta-tclass-6840-dict-fixture)
106

117
ROOTTEST_ADD_TEST(pairWriteFile
128
MACRO pairWrite.C
139
OUTREF pairWrite.ref
14-
DEPENDS libPairs-build)
10+
FIXTURES_REQUIRED root-meta-tclass-6840-dict-fixture
11+
FIXTURES_SETUP root-meta-tclass-6840-pairWriteFile-fixture)
1512

13+
ROOTTEST_ADD_TEST(pairCalculation
14+
MACRO execPair.C
15+
OUTREF execPair.ref
16+
FIXTURES_REQUIRED root-meta-tclass-6840-pairWriteFile-fixture)
1617

17-
ROOTTEST_GENERATE_EXECUTABLE(emulatePairs emulatePairs.cpp LIBRARIES Core RIO Tree)
18+
ROOTTEST_GENERATE_EXECUTABLE(emulatePairs
19+
emulatePairs.cpp
20+
LIBRARIES Core RIO Tree
21+
FIXTURES_SETUP root-meta-tclass-6840-emulatePairs-fixture)
1822

1923
ROOTTEST_ADD_TEST(emulatePairsTest
2024
EXEC ./emulatePairs
2125
OUTCNVCMD sed -e s:0x[0-9a-fA-F]*:pointervalue:g -e s:->[0-9a-fA-F]*:pointervalue:g
2226
OUTREF emulatePairs.ref
23-
DEPENDS libPairs-build emulatePairs-build)
27+
FIXTURES_REQUIRED root-meta-tclass-6840-dict-fixture root-meta-tclass-6840-emulatePairs-fixture)

roottest/root/meta/tclass/tempParse.C

100755100644
File mode changed.

roottest/root/meta/tclass/usedBits.C

Lines changed: 0 additions & 51 deletions
This file was deleted.

roottest/root/meta/tclass/usedBits.ref

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)