Skip to content

Commit 3a8dfca

Browse files
vgvassilevpcanal
authored andcommitted
[cxxmodules] Filter out source locations.
.typedef command in ROOT prints the format: Vector4Dfwd.h -1 typedef ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double> >ROOT::Math::XYZTVector Where -1 signals that the typedef is in an ASTFile (PCH or PCM) or displays a line number otherwise. This PR moves the information in a module and makes the seen source location -1 which differs from the one in the ref file. We have another ref file called output.ref-5 which contained -1 as it was the behavior of CINT 5. We cannot reuse this ref file because our typedef location information is more accurate and it says it is in mycl.C rather than mycl.so. This patch removes the source location from the expected and seen output.
1 parent bbdfbd6 commit 3a8dfca

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

cling/typedef_global/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ ROOTTEST_ADD_TEST(scopeTest
1414
ROOTTEST_ADD_TEST(scopeTest2
1515
MACRO rungood.C
1616
OUTREF output.ref-cling
17+
OUTCNV scopeTest_conversion.sh
1718
DEPENDS ${depends}
1819
LABELS roottest regression cling)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
mycl.C 12 typedef ConstLink<Toy> MyClass<Toy>::value_type
2+
mycl.C N/A typedef ConstLink<Toy> MyClass<Toy>::value_type
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
grep -v Processing | sed -e s/myclbad.so/mycl.so/ -e s/10/12/ -e s/::ConstLink/ConstLink/
1+
grep -v Processing | sed -e s/myclbad.so/mycl.so/ -e s/10/12/ -e s/::ConstLink/ConstLink/ | sed -E "s,-?[0-9]+,N/A,"

0 commit comments

Comments
 (0)