Skip to content

Commit 01171e0

Browse files
committed
[roottest] enable aclic/offset test in cmake
1 parent 894fbf9 commit 01171e0

File tree

6 files changed

+69
-40
lines changed

6 files changed

+69
-40
lines changed
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
ROOTTEST_COMPILE_MACRO(TOffset.cxx)
1+
ROOTTEST_COMPILE_MACRO(TOffset.cxx
2+
FIXTURES_SETUP root-aclic-offset-TOffset-fixture)
3+
4+
ROOTTEST_ADD_TEST(offset
5+
MACRO runoffset.C
6+
ROOTEXE_OPTS -e "(void)gROOT->ProcessLine(\".L TOffset.cxx+\")"
7+
OUTREF offset.ref
8+
FIXTURES_REQUIRED root-aclic-offset-TOffset-fixture)

roottest/root/aclic/offset/TOffset.cpp

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

roottest/root/aclic/offset/TOffset.h

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class TOffset {
3535
void Print(const char* opt="") const;
3636
Int_t GetOffset(const char *name) const;
3737

38-
static void Test();
39-
static Int_t Aligne(Int_t off,Int_t mult)
38+
static void Test();
39+
static Int_t Aligne(Int_t off,Int_t mult)
4040
{Int_t r = off%mult; if (r) off += mult - r; return off;}
4141

4242
private:
@@ -47,49 +47,49 @@ static Int_t Aligne(Int_t off,Int_t mult)
4747

4848

4949
// static members
50-
50+
5151
static Int_t fgAlign[16];
5252
static Int_t fgSize [16];
5353
static Int_t fgWhereVirt;
5454
static Int_t fgSolBug;
5555

5656
enum EAlign {
57-
kAlignChar,
58-
kAlignShort,
59-
kAlignInt,
60-
kAlignLong,
61-
kAlignPoint,
62-
kAlignFloat,
63-
kAlignDouble,
64-
kAlignBool,
65-
kAlignVirt,
66-
kAlignVector,
67-
kAlignList,
68-
kAlignDeque,
69-
kAlignMap,
70-
kAlignMultiMap,
71-
kAlignSet,
72-
kAlignMultiSet
57+
kAlignChar,
58+
kAlignShort,
59+
kAlignInt,
60+
kAlignLong,
61+
kAlignPoint,
62+
kAlignFloat,
63+
kAlignDouble,
64+
kAlignBool,
65+
kAlignVirt,
66+
kAlignVector,
67+
kAlignList,
68+
kAlignDeque,
69+
kAlignMap,
70+
kAlignMultiMap,
71+
kAlignSet,
72+
kAlignMultiSet
7373
};
7474

75-
75+
7676
enum ESize {
77-
kSizeChar,
78-
kSizeShort,
79-
kSizeInt,
80-
kSizeLong,
81-
kSizePoint,
82-
kSizeFloat,
83-
kSizeDouble,
84-
kSizeBool,
85-
kSizeVirt,
86-
kSizeVector,
87-
kSizeList,
88-
kSizeDeque,
89-
kSizeMap,
90-
kSizeMultiMap,
91-
kSizeSet,
92-
kSizeMultiSet
77+
kSizeChar,
78+
kSizeShort,
79+
kSizeInt,
80+
kSizeLong,
81+
kSizePoint,
82+
kSizeFloat,
83+
kSizeDouble,
84+
kSizeBool,
85+
kSizeVirt,
86+
kSizeVector,
87+
kSizeList,
88+
kSizeDeque,
89+
kSizeMap,
90+
kSizeMultiMap,
91+
kSizeSet,
92+
kSizeMultiSet
9393
};
9494

9595

@@ -106,7 +106,7 @@ static Int_t Aligne(Int_t off,Int_t mult)
106106
Int_t fNBase;
107107
TList *fOffsetList;
108108
};
109-
#ifdef __CINT__
109+
#ifdef __ROOTCLING__
110110
#pragma link C++ class TOffset+;
111111
#endif
112112
#endif

roottest/root/aclic/offset/offset.ref

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
Processing runoffset.C...
3+
size TH1D,TArrayD,my=1000,24,1024 offset=1000
4+
size TH1D,TArrayD,my=1000,24,1024 offset=1000
5+
size TH1D,TArrayD,my=1000,24,1008 offset=1000
6+
Tail1: first size=608 c012offset=8 600 608,TailSize=616
7+
Tail2: first size=608 c0121offset=8 600 601,TailSize=608
8+
Tail3: first size=608 c012offset=8 600 608,TailSize=624
9+
Tail2: first size=608 c0121offset=8 600 601,TailSize=608
10+
TailP: first size=96 offset=96 TailSize=104
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
Processing runoffset.C...
3+
size TH1D,TArrayD,my=1000,24,1024 offset=1000
4+
size TH1D,TArrayD,my=1000,24,1024 offset=1000
5+
size TH1D,TArrayD,my=1000,24,1008 offset=1000
6+
Tail1: first size=608 c012offset=8 600 608,TailSize=616
7+
Tail2: first size=608 c0121offset=8 600 601,TailSize=608
8+
Tail3: first size=608 c012offset=8 600 608,TailSize=624
9+
Tail2: first size=608 c0121offset=8 600 601,TailSize=608
10+
TailP: first size=96 offset=96 TailSize=104
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
void runoffset()
2+
{
3+
TOffset::Test();
4+
}

0 commit comments

Comments
 (0)