Skip to content

Commit 8425de1

Browse files
committed
[roottest] use cmake for root/tree/reader tests
Two tests failing while eventdata.root file is missing on eos
1 parent 23f2059 commit 8425de1

File tree

5 files changed

+51
-90
lines changed

5 files changed

+51
-90
lines changed

roottest/root/tree/reader/.rootrc

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,59 @@
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()
8-
ROOTTEST_ADD_TESTDIRS()
9-
101
# ROOT-10046
11-
ROOTTEST_ADD_TEST(test_oddName
2+
ROOTTEST_ADD_TEST(oddName
123
COPY_TO_BUILDDIR root-10046.root
134
MACRO oddName.C)
145

156
# ROOT-9757
16-
ROOTTEST_ADD_TEST(test_numberBranchesRead
7+
ROOTTEST_ADD_TEST(numberBranchesRead
178
MACRO test_numberBranchesRead.C
189
MACROARG "\"${CMAKE_CURRENT_SOURCE_DIR}/../../dataframe/Slimmed_TotemNTuple_9883.040.ntuple.root\"")
1910

2011
# ROOT-6286
21-
ROOTTEST_ADD_TEST(test_runcleanupChain
12+
ROOTTEST_ADD_TEST(cleanupChain
2213
MACRO runcleanupChain.C)
14+
15+
ROOTTEST_ADD_TEST(hsimple-create
16+
MACRO ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C
17+
PASSRC 255
18+
FIXTURES_SETUP root-tree-reader-hsimple-fixture)
19+
20+
ROOTTEST_ADD_TEST(ReaderIterator
21+
MACRO assertReaderIterator.C
22+
FIXTURES_REQUIRED root-tree-reader-hsimple-fixture)
23+
24+
ROOTTEST_ADD_TEST(Structlong64
25+
MACRO assertStructlong64.C)
26+
27+
ROOTTEST_ADD_TEST(CheckLateProxy
28+
MACRO execCheckLateProxy.C
29+
OUTREF execCheckLateProxy.ref
30+
FIXTURES_REQUIRED root-tree-reader-hsimple-fixture)
31+
32+
ROOTTEST_ADD_TEST(Enum
33+
MACRO execEnum.cxx+
34+
OUTREF execEnum.ref)
35+
36+
ROOTTEST_ADD_TEST(VectorBranches
37+
MACRO execVectorBranches.C
38+
OUTREF execVectorBranches.ref)
39+
40+
ROOTTEST_COMPILE_MACRO(A.h
41+
FIXTURES_SETUP root-tree-reader-A-fixture)
42+
43+
ROOTTEST_COMPILE_MACRO(hardTreeReaderTest.cpp
44+
FIXTURES_REQUIRED root-tree-reader-A-fixture
45+
FIXTURES_SETUP root-tree-reader-hardTreeReaderTest-fixture)
46+
47+
ROOTTEST_ADD_TEST(complexTree
48+
MACRO runcomplexTree.C
49+
OUTREF complexTree.ref
50+
FIXTURES_REQUIRED root-tree-reader-A-fixture root-tree-reader-hardTreeReaderTest-fixture)
51+
52+
# IntroTut tests fails while file eventdata.root is missing on eos
53+
# ROOTTEST_ADD_TEST(assertIntroTut
54+
# MACRO assertIntroTut.C)
55+
#
56+
# ROOTTEST_ADD_TEST(IntroTut
57+
# MACRO execIntroTut.C
58+
# OUTREF execIntroTut.ref)
59+

roottest/root/tree/reader/Makefile

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

roottest/root/tree/reader/assertReaderIterator.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <iterator>
44

55
int assertReaderIterator() {
6-
TFile f("$ROOTSYS/tutorials/hsimple.root");
6+
TFile f("hsimple.root");
77
if (f.IsZombie()) {
88
Error("assertReaderIterator()", "cannot open hsimple.root\n");
99
return 2;

roottest/root/tree/reader/execCheckLateProxy.C

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
int execCheckLateProxy(){
2-
TString hSimplePath = gROOT->GetTutorialsDir();
3-
hSimplePath+="/hsimple.root";
2+
TString hSimplePath = "hsimple.root";
43
TFile f(hSimplePath);
54
auto t = (TTree*)f.Get("ntuple");
65
TTreeReader r(t);

0 commit comments

Comments
 (0)