Skip to content

Commit 2254ead

Browse files
committed
[test] Add tests for previously failing interactive sessions
Moreover increase coverage on arm, now that exception trapping in interpreted code is supported. Fixes #6439
1 parent 43c20a5 commit 2254ead

4 files changed

Lines changed: 50 additions & 18 deletions

File tree

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ROOT::RDataFrame(10).Define("x", [] { return 42; }).Snapshot<int>("t", "f.root");
2+
ROOT::RDataFrame(10).Define("x", [] { return 42; }).Snapshot<int>("t", "f.root");
3+
.q
4+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Long32_t ba;
2+
Long32_t ba;
3+
.q
4+

roottest/root/rint/7970_input.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.rawInput
2+
std::vector<short> getV() { return {42}; }
3+
.rawInput
4+
getV()[0].foo()
5+
getV()[0]
6+
7+
.q
8+

roottest/root/rint/CMakeLists.txt

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,46 @@
1-
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64.*|x86.*|amd64.*|AMD64.*|i686.*|i386.*")
2-
# All platforms except of ARM/AARCH64
3-
ROOTTEST_ADD_TEST(TabCom
4-
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
5-
INPUT TabCom_input.txt
6-
OUTCNV filterOpt.sh
7-
OUTREF TabCom.oref
8-
ERRREF TabCom.eref
9-
COPY_TO_BUILDDIR MyClass.h)
1+
if (NOT MSVC)
2+
# ROOT-5843
3+
ROOTTEST_ADD_TEST(dotLibraries
4+
COMMAND $<TARGET_FILE:root> -b -q -e ".libraries"
5+
PASSREGEX "libRint")
6+
7+
ROOTTEST_ADD_TEST(TabCom
8+
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
9+
INPUT TabCom_input.txt
10+
OUTCNV filterOpt.sh
11+
OUTREF TabCom.oref
12+
ERRREF TabCom.eref
13+
COPY_TO_BUILDDIR MyClass.h)
1014

11-
ROOTTEST_ADD_TEST(BackslashNewline
15+
ROOTTEST_ADD_TEST(BackslashNewline
16+
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
17+
INPUT BackslashNewline_input.txt)
18+
19+
# issue 6439
20+
if(dataframe)
21+
ROOTTEST_ADD_TEST(failedCompilationBadState_1
1222
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
13-
INPUT BackslashNewline_input.txt)
23+
INPUT 6439_1_input.txt
24+
FAILREGEX "You are probably missing the definition|Assertion")
25+
endif()
26+
27+
ROOTTEST_ADD_TEST(failedCompilationBadState_2
28+
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
29+
INPUT 6439_2_input.txt
30+
FAILREGEX "You are probably missing the definition|Assertion")
31+
32+
# issue 7970: The test disabled since the bug is still there on many platforms
33+
#ROOTTEST_ADD_TEST(failedCompilationBadState_3
34+
# COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/driveTabCom.py
35+
# INPUT 7970_input.txt
36+
# FAILREGEX "You are probably missing the definition|Assertion")
1437
endif()
1538

1639
# ROOT-10425
1740
ROOTTEST_ADD_TEST(missingSymbol
1841
MACRO missingSymbol.C
1942
PASSREGEX "You are probably missing the definition of.*MissingSymbol.*")
2043

21-
if (NOT MSVC)
22-
# ROOT-5843
23-
ROOTTEST_ADD_TEST(dotLibraries
24-
COMMAND $<TARGET_FILE:root> -b -q -e ".libraries"
25-
PASSREGEX "libRint")
26-
endif()
27-
2844
# issue 11707
2945
ROOTTEST_ADD_TEST(macroCalledMain
3046
COPY_TO_BUILDDIR main.cpp

0 commit comments

Comments
 (0)