Skip to content

Commit 3a17de2

Browse files
committed
[roottest] use cmake for root/io/rootcint tests
1 parent 062c3e1 commit 3a17de2

File tree

9 files changed

+91
-130
lines changed

9 files changed

+91
-130
lines changed

roottest/root/io/rootcint/.rootrc

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,48 @@
11
ROOTTEST_ADD_TESTDIRS()
2+
3+
ROOTTEST_GENERATE_DICTIONARY(testDict
4+
test.h
5+
LINKDEF testLinkDef.h
6+
NO_ROOTMAP NO_CXXMODULE)
7+
8+
ROOTTEST_COMPILE_MACRO(cltest.C
9+
FIXTURES_SETUP root-io-rootcint-cltest-fixture)
10+
11+
ROOTTEST_ADD_TEST(cltest
12+
MACRO cltest.C+
13+
OUTREF cltest.ref
14+
FIXTURES_REQUIRED root-io-rootcint-cltest-fixture)
15+
16+
ROOTTEST_ADD_TEST(TemplateExpr
17+
MACRO execTemplateExpr.C
18+
OUTREF execTemplateExpr.ref)
19+
20+
ROOTTEST_COMPILE_MACRO(virtualbase.h
21+
FIXTURES_SETUP root-io-rootcint-virtualbase-fixture)
22+
23+
ROOTTEST_ADD_TEST(nestedtemplate
24+
MACRO runnestedtemplate.C
25+
OUTREF nestedtemplate.ref)
26+
27+
ROOTTEST_COMPILE_MACRO(templateKeyword.C
28+
FIXTURES_SETUP root-io-rootcint-templateKeyword-fixture)
29+
30+
ROOTTEST_ADD_TEST(templateKeyword
31+
MACRO runtemplateKeyword.C
32+
OUTREF templateKeyword.ref
33+
FIXTURES_REQUIRED root-io-rootcint-templateKeyword-fixture)
34+
35+
ROOTTEST_ADD_TEST(virtualbase
36+
MACRO runvirtualbase.C
37+
OUTREF virtualbase.ref
38+
FIXTURES_REQUIRED root-io-rootcint-virtualbase-fixture)
39+
40+
ROOTTEST_GENERATE_DICTIONARY(weirdpair
41+
weirdpair.h
42+
LINKDEF weirdpair_LinkDef.h
43+
NO_ROOTMAP NO_CXXMODULE)
44+
45+
ROOTTEST_GENERATE_DICTIONARY(foo
46+
foo.hh
47+
LINKDEF foo_linkdef.h
48+
NO_ROOTMAP NO_CXXMODULE)

roottest/root/io/rootcint/Makefile

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

roottest/root/io/rootcint/foo.hh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
#include "TObject.h"
1+
#pragma once
22

3+
#include "TObject.h"
34

45
namespace ns {
56

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
Processing runnestedtemplate.C...

roottest/root/io/rootcint/rootlogon.C

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,54 @@
11
#include "TNamed.h"
22

3-
template< class T1 >
4-
class A {
5-
// ...
6-
private:
7-
template< class T2 >
8-
class B {
9-
T2 fValue;
10-
};
11-
12-
template< class T2 >
13-
class C : public TNamed {
14-
T2 fValue;
3+
template< class T1 >
4+
class A {
5+
// ...
6+
private:
7+
template< class T2 >
8+
class B {
9+
T2 fValue;
10+
};
11+
12+
template< class T2 >
13+
class C : public TNamed {
14+
T2 fValue;
1515
ClassDef(C,1);
16-
};
17-
18-
A<T1>::B< T1 > fMember3;
19-
A::B< T1 > fMember2;
16+
};
17+
18+
A<T1>::B< T1 > fMember3;
19+
A::B< T1 > fMember2;
2020
B< T1 > fMember1;
2121
C<T1> fCMember1;
2222

2323
};
2424

25-
template< class T1 >
26-
class TA : public TObject {
27-
// ...
28-
private:
29-
template< class T2 >
30-
class B {
31-
T2 fValue;
32-
};
33-
34-
template< class T2 >
35-
class C : public TNamed {
36-
T2 fValue;
25+
template< class T1 >
26+
class TA : public TObject {
27+
// ...
28+
private:
29+
template< class T2 >
30+
class B {
31+
T2 fValue;
32+
};
33+
34+
template< class T2 >
35+
class C : public TNamed {
36+
T2 fValue;
3737
ClassDef(C,1);
38-
};
39-
40-
TA<T1>::B< T1 > fMember3;
41-
TA::B< T1 > fMember2;
38+
};
39+
40+
TA<T1>::B< T1 > fMember3;
41+
TA::B< T1 > fMember2;
4242
B< T1 > fMember1;
4343
C<T1> fCMember1;
44-
44+
4545
ClassDef(TA,1);
4646
};
4747

48-
A<short> a;
49-
TA<short> ta;
48+
void runnestedtemplate()
49+
{
50+
A<short> a;
51+
TA<short> ta;
52+
}
53+
54+

roottest/root/io/rootcint/runsigbug.C

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

roottest/root/io/rootcint/sigbug.ref

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

0 commit comments

Comments
 (0)