Skip to content

Commit 9a5d2d1

Browse files
linevlinev
committed
[roottest] use cmake for root/tree/address tests
Build dictionary in convertIssues/ subdir and correspondent lib before running test Remove exe bit from many sources Remove rootlogon.C script - used only with runiobug.C, where necessary script load with ROOTEXE_OPTS
1 parent 67da919 commit 9a5d2d1

36 files changed

+351
-206
lines changed

‎roottest/root/tree/addresses/.rootrc‎

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

‎roottest/root/tree/addresses/BadBaseAddresses.ref‎

100755100644
File mode changed.

‎roottest/root/tree/addresses/CMakeLists.txt‎

Lines changed: 240 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,241 @@
1-
#-------------------------------------------------------------------------------
2-
#
3-
# Placeholder file to translate the tests to the new CTest system. Meanwhile we
4-
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
5-
#
6-
#-------------------------------------------------------------------------------
7-
ROOTTEST_ADD_OLDTEST(LABELS longtest)
1+
ROOTTEST_ADD_TESTDIRS()
82

3+
ROOTTEST_COMPILE_MACRO(inherit.C
4+
FIXTURES_SETUP root-tree-addresses-inherit-fixture)
5+
6+
if(ClingWorkAroundMissingDynamicScope)
7+
SET(_inherit_opts -e "(void)gROOT->ProcessLine(\".L inherit.C+g\")")
8+
endif()
9+
10+
ROOTTEST_ADD_TEST(inherit
11+
MACRO runInherit.C
12+
ROOTEXE_OPTS ${_inherit_opts}
13+
OUTREF inheritTest.ref
14+
FIXTURES_REQUIRED root-tree-addresses-inherit-fixture)
15+
16+
ROOTTEST_COMPILE_MACRO(header.h
17+
FIXTURES_SETUP root-tree-addresses-header-fixture)
18+
19+
if(ClingWorkAroundMissingDynamicScope)
20+
SET(_header_opts -e "(void)gROOT->ProcessLine(\".L header.h+g\")")
21+
endif()
22+
23+
ROOTTEST_ADD_TEST(header
24+
MACRO runHeader.C
25+
ROOTEXE_OPTS ${_header_opts}
26+
OUTREF headerTest.ref
27+
FIXTURES_REQUIRED root-tree-addresses-header-fixture)
28+
29+
ROOTTEST_COMPILE_MACRO(clonesA_Event.cxx
30+
FIXTURES_SETUP root-tree-addresses-clonesA_Event-fixture)
31+
32+
if(ClingWorkAroundMissingDynamicScope)
33+
SET(_clonesA_opts -e "(void)gROOT->ProcessLine(\".L clonesA_Event.cxx+\")")
34+
endif()
35+
36+
ROOTTEST_ADD_TEST(clonesA
37+
MACRO clonesA_rw.C
38+
ROOTEXE_OPTS ${_clonesA_opts}
39+
FIXTURES_REQUIRED root-tree-addresses-clonesA_Event-fixture)
40+
41+
ROOTTEST_COMPILE_MACRO(Embedded_load.C
42+
FIXTURES_SETUP root-tree-addresses-Embedded_load-fixture)
43+
44+
if(ClingWorkAroundMissingDynamicScope)
45+
SET(_embedLoad_opts -e "(void)gROOT->ProcessLine(\".L Embedded_load.C+\")")
46+
endif()
47+
48+
ROOTTEST_ADD_TEST(embwrite
49+
MACRO embwrite.C
50+
ROOTEXE_OPTS ${_embedLoad_opts}
51+
FIXTURES_REQUIRED root-tree-addresses-Embedded_load-fixture
52+
FIXTURES_SETUP root-tree-addresses-embwrite-fixture)
53+
54+
ROOTTEST_ADD_TEST(embread
55+
MACRO embread.C
56+
ROOTEXE_OPTS ${_embedLoad_opts}
57+
OUTREF EmbeddedTest.ref
58+
FIXTURES_REQUIRED root-tree-addresses-Embedded_load-fixture
59+
root-tree-addresses-embwrite-fixture)
60+
61+
ROOTTEST_COMPILE_MACRO(relations_load.C
62+
FIXTURES_SETUP root-tree-addresses-relations_load-fixture)
63+
64+
ROOTTEST_COMPILE_MACRO(relations_read.C
65+
FIXTURES_SETUP root-tree-addresses-relations_read-fixture)
66+
67+
ROOTTEST_COMPILE_MACRO(relations_write.C
68+
FIXTURES_SETUP root-tree-addresses-relations_write-fixture)
69+
70+
SET(_relations_opts -e "(void)gROOT->ProcessLine(\".L relations_load.C+\")"
71+
-e "(void)gROOT->ProcessLine(\".L relations_write.C+\")"
72+
-e "(void)gROOT->ProcessLine(\".L relations_read.C+\")")
73+
74+
ROOTTEST_ADD_TEST(relations
75+
MACRO relationsRun.C
76+
ROOTEXE_OPTS ${_relations_opts}
77+
OUTREF relationsTest.ref
78+
OUTCNVCMD sed -e "s|File Size =.*\\*||g"
79+
FIXTURES_REQUIRED root-tree-addresses-relations_load-fixture
80+
root-tree-addresses-relations_read-fixture
81+
root-tree-addresses-relations_write-fixture)
82+
83+
ROOTTEST_ADD_TEST(merging
84+
MACRO runmerging.C
85+
OUTREF merging.ref)
86+
87+
ROOTTEST_COMPILE_MACRO(iobug.C
88+
FIXTURES_SETUP root-tree-addresses-iobug-fixture)
89+
90+
ROOTTEST_ADD_TEST(iobug
91+
MACRO runiobug.C
92+
ROOTEXE_OPTS -e "(void)gROOT->ProcessLine(\".L ${CMAKE_SOURCE_DIR}/roottest/scripts/utils.cc+\")"
93+
OUTREF iobug.ref
94+
FIXTURES_REQUIRED root-tree-addresses-iobug-fixture)
95+
96+
ROOTTEST_COMPILE_MACRO(userClass.C
97+
FIXTURES_SETUP root-tree-addresses-userClass-fixture)
98+
99+
ROOTTEST_COMPILE_MACRO(treeBranch.C
100+
FIXTURES_SETUP root-tree-addresses-treeBranch-fixture)
101+
102+
if(ClingWorkAroundMissingUnloading)
103+
set(_treeBranch_ref treeBranch.ref-missingUnloading)
104+
else()
105+
set(_treeBranch_ref treeBranch.ref)
106+
endif()
107+
108+
ROOTTEST_ADD_TEST(treeBranch
109+
MACRO runtreeBranch.C
110+
OUTREF ${_treeBranch_ref}
111+
FIXTURES_REQUIRED root-tree-addresses-userClass-fixture
112+
root-tree-addresses-treeBranch-fixture)
113+
114+
ROOTTEST_COMPILE_MACRO(test_Persistency0.C
115+
FIXTURES_SETUP root-tree-addresses-test_Persistency0-fixture)
116+
117+
ROOTTEST_COMPILE_MACRO(test_Persistency1.C
118+
FIXTURES_SETUP root-tree-addresses-test_Persistency1-fixture)
119+
120+
ROOTTEST_COMPILE_MACRO(test_Persistency3.C
121+
FIXTURES_SETUP root-tree-addresses-test_Persistency3-fixture)
122+
123+
ROOTTEST_ADD_TEST(inheritAndOwn
124+
MACRO runinheritAndOwn.C
125+
OUTREF inheritAndOwn.ref
126+
FIXTURES_REQUIRED root-tree-addresses-test_Persistency0-fixture
127+
root-tree-addresses-test_Persistency3-fixture)
128+
129+
ROOTTEST_ADD_TEST(BadBaseAddresses
130+
MACRO runBadBaseAddresses.C
131+
OUTREF BadBaseAddresses.ref
132+
FIXTURES_REQUIRED root-tree-addresses-test_Persistency1-fixture)
133+
134+
ROOTTEST_ADD_TEST(ursula
135+
MACRO runursula.C
136+
COPY_TO_BUILDDIR cmsursula.root
137+
OUTREF ursula.ref)
138+
139+
ROOTTEST_COMPILE_MACRO(ConfigRecord.cxx
140+
FIXTURES_SETUP root-tree-addresses-ConfigRecord-fixture)
141+
142+
ROOTTEST_COMPILE_MACRO(sueloader.C
143+
FIXTURES_SETUP root-tree-addresses-sueloader-fixture)
144+
145+
if(ClingWorkAroundMissingDynamicScope)
146+
SET(_sue_opts -e "(void)gROOT->ProcessLine(\".L sueloader.C+\")"
147+
-e "(void)gROOT->ProcessLine(\".L ConfigRecord.cxx+\")")
148+
endif()
149+
150+
ROOTTEST_ADD_TEST(configtest
151+
MACRO suetestwrt.C
152+
ROOTEXE_OPTS ${_sue_opts}
153+
OUTREF configtest.ref
154+
FIXTURES_REQUIRED root-tree-addresses-ConfigRecord-fixture
155+
root-tree-addresses-sueloader-fixture
156+
FIXTURES_SETUP root-tree-addresses-configtest-fixture)
157+
158+
ROOTTEST_ADD_TEST(suetest
159+
MACRO suetestrd.C
160+
ROOTEXE_OPTS ${_sue_opts}
161+
OUTREF suetest.ref
162+
FIXTURES_REQUIRED root-tree-addresses-ConfigRecord-fixture
163+
root-tree-addresses-sueloader-fixture
164+
root-tree-addresses-configtest-fixture)
165+
166+
ROOTTEST_COMPILE_MACRO(JansEvent.C
167+
FIXTURES_SETUP root-tree-addresses-JansEvent-fixture)
168+
169+
ROOTTEST_ADD_TEST(Jantest
170+
MACRO runJantest.C
171+
COPY_TO_BUILDDIR janbug.root
172+
OUTREF Jantest.ref
173+
FIXTURES_REQUIRED root-tree-addresses-JansEvent-fixture)
174+
175+
ROOTTEST_ADD_TEST(deepnest
176+
MACRO rundeepnest.C+
177+
OUTREF deepnest.ref)
178+
179+
ROOTTEST_ADD_TEST(baseString
180+
MACRO runbaseString.C+
181+
OUTREF baseString.ref)
182+
183+
ROOTTEST_ADD_TEST(prova
184+
MACRO runprova.C
185+
COPY_TO_BUILDDIR prova1.root prova2.root
186+
OUTREF prova.ref)
187+
188+
ROOTTEST_ADD_TEST(augertest
189+
MACRO runaugertest.C
190+
COPY_TO_BUILDDIR data/S_1_1004_qgsjet_100_1.KGrec.root
191+
data/S_1_104_qgsjet_100_1.KGrec.root
192+
OUTREF augertest.ref)
193+
194+
ROOTTEST_ADD_TEST(longlong
195+
MACRO runlonglong.C+
196+
OUTCNVCMD sed -e s:0x[0-9a-fA-F]*:0xRemoved:g
197+
OUTREF longlong.ref)
198+
199+
ROOTTEST_ADD_TEST(memleak
200+
MACRO runmemleak.C+
201+
COPY_TO_BUILDDIR memleak.root
202+
OUTREF memleak.ref)
203+
204+
ROOTTEST_ADD_TEST(Leaflist
205+
MACRO execLeaflist.C
206+
COPY_TO_BUILDDIR leaflist.root
207+
OUTREF execLeaflist.ref)
208+
209+
ROOTTEST_ADD_TEST(twrite
210+
MACRO assert_twrite.cxx+
211+
ERRREF assert_twrite.ref
212+
FIXTURES_SETUP root-tree-addresses-twrite-fixture)
213+
214+
ROOTTEST_ADD_TEST(tread
215+
MACRO assert_tread.cxx+
216+
ERRREF assert_tread.ref
217+
FIXTURES_REQUIRED root-tree-addresses-twrite-fixture)
218+
219+
ROOTTEST_ADD_TEST(ReuseTree
220+
MACRO execReuseTree.C
221+
OUTREF execReuseTree.ref)
222+
223+
ROOTTEST_ADD_TEST(BranchObjSplit0
224+
MACRO execBranchObjSplit0.C
225+
OUTREF execBranchObjSplit0.ref)
226+
227+
ROOTTEST_ADD_TEST(CheckErrors
228+
MACRO execCheckErrors.C
229+
OUTREF execCheckErrors.ref)
230+
231+
ROOTTEST_ADD_TEST(CMSobj
232+
MACRO execCMSobj.cxx+
233+
OUTREF execCMSobj.ref)
234+
235+
ROOTTEST_COMPILE_MACRO(jet.C
236+
FIXTURES_SETUP root-tree-addresses-jet-fixture)
237+
238+
ROOTTEST_ADD_TEST(Jet
239+
MACRO runJet.C
240+
OUTREF Jet.ref
241+
FIXTURES_REQUIRED root-tree-addresses-jet-fixture)

‎roottest/root/tree/addresses/ConfigRecord.cxx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#ifndef ConfigRecord_cxx
2-
#ifdef ClingWorkAroundMultipleInclude
32
#define ConfigRecord_cxx
4-
#endif
53

64
#include "ConfigRecord.h"
75

‎roottest/root/tree/addresses/ConfigRecord.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1+
#ifndef ConfigRecord_h
2+
#define ConfigRecord_h
13

24
#include "RecHeader.h"
3-
#include "RecDataRecord.cxx"
4-
#include "RecRecordImp.cxx"
5+
#include "RecDataRecord.h"
6+
// #include "RecRecordImp.cxx"
57

68
class ConfigRecord : public RecDataRecord<RecHeader>
79
{
810

911
public:
1012
ConfigRecord() {}
11-
ConfigRecord(const RecHeader& header) : RecDataRecord<RecHeader>(header){}
13+
ConfigRecord(const RecHeader& header) : RecDataRecord<RecHeader>(header){}
1214
~ConfigRecord() override {}
1315

1416

1517
ClassDefOverride(ConfigRecord,1) // ConfigRecord
1618
};
19+
20+
#endif

‎roottest/root/tree/addresses/Context.cxx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
#include <iostream>
2-
using namespace std;
3-
41
#include "Context.h"
52

3+
#include <iostream>
4+
65
ClassImp(Context)
76

87
//_____________________________________________________________________________
98
void Context::Print(Option_t *) const
109
{
1110
// Print this object
1211

13-
cout << "Context::Print " << endl;
14-
cout << "Detector " << fDetector << " SimFlag " << fSimFlag
15-
<< " Time " << fTimeStamp << endl;
12+
std::cout << "Context::Print " << std::endl;
13+
std::cout << "Detector " << fDetector << " SimFlag " << fSimFlag
14+
<< " Time " << fTimeStamp << std::endl;
1615
}
1716

‎roottest/root/tree/addresses/Embedded_load.C‎

100755100644
File mode changed.

‎roottest/root/tree/addresses/JansEvent.C‎

100755100644
File mode changed.

‎roottest/root/tree/addresses/JansEvent.h‎

100755100644
File mode changed.

‎roottest/root/tree/addresses/Jet.ref‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
Processing runJet.C...
3+
In event 0 jet #0 value are correct 0,33,44,55,0
4+
In event 0 jet #1 value are correct 0,33,44,55,1
5+
In event 0 jet #2 value are correct 0,33,44,55,2
6+
In event 0 jet #3 value are correct 0,33,44,55,3
7+
In event 0 jet #4 value are correct 0,33,44,55,4
8+
In event 1 jet #0 value are correct 1,33,44,55,0
9+
In event 1 jet #1 value are correct 1,33,44,55,1
10+
In event 1 jet #2 value are correct 1,33,44,55,2
11+
In event 1 jet #3 value are correct 1,33,44,55,3
12+
In event 1 jet #4 value are correct 1,33,44,55,4
13+
In event 2 jet #0 value are correct 2,33,44,55,0
14+
In event 2 jet #1 value are correct 2,33,44,55,1
15+
In event 2 jet #2 value are correct 2,33,44,55,2
16+
In event 2 jet #3 value are correct 2,33,44,55,3
17+
In event 2 jet #4 value are correct 2,33,44,55,4

0 commit comments

Comments
 (0)