File tree Expand file tree Collapse file tree 3 files changed +6
-3
lines changed
bindings/pyroot/pythonizations/test Expand file tree Collapse file tree 3 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -29,6 +29,9 @@ class ImportLoadLibs(unittest.TestCase):
29
29
'librt' ,
30
30
'libncurses.*' ,
31
31
'libtinfo' , # by libncurses (on some older platforms)
32
+ # adaptivecpp and dependencies
33
+ 'libacpp-rt' ,
34
+ 'libgomp' ,
32
35
# libTree and dependencies
33
36
'libTree' ,
34
37
'libThread' ,
Original file line number Diff line number Diff line change 1
- if (NOT MSVC OR win_broken_tests )
1
+ if (( NOT MSVC OR win_broken_tests ) AND NOT experimental_adaptivecpp )
2
2
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64.*|x86.*|amd64.*|AMD64.*|i686.*|i386.*" )
3
3
# All platforms except of ARM/AARCH64
4
4
set (RootExeOptions "--ptrcheck" )
@@ -9,7 +9,7 @@ if(NOT MSVC OR win_broken_tests)
9
9
endif ()
10
10
endif ()
11
11
12
- if (NOT (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64 ) OR M1_BROKEN_TESTS )
12
+ if (( NOT (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64 ) OR M1_BROKEN_TESTS ) AND NOT experimental_adaptivecpp )
13
13
ROOTTEST_ADD_TEST (nullderef-e
14
14
COMMAND ${ROOT_root_CMD} -l -b -q --ptrcheck -e "int*p=nullptr" -e "*p"
15
15
PASSRC 1
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ ROOT_EXECUTABLE(guitest guitest.cxx LIBRARIES RIO Gui Gpad Hist)
75
75
#ROOT_ADD_TEST(test-hsimple COMMAND hsimple)
76
76
77
77
#---invalid pointer checks---------------------------------------------------------------------
78
- if (NOT (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64 ) OR M1_BROKEN_TESTS )
78
+ if (( NOT (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64 ) OR M1_BROKEN_TESTS ) AND NOT experimental_adaptivecpp )
79
79
ROOT_ADD_TEST (test -check-nullptr
80
80
COMMAND ${ROOT_root_CMD} -b -q -l --ptrcheck -e "int*ptr=(int*)0" -e "*ptr"
81
81
PASSREGEX "dereference null pointer" )
You can’t perform that action at this time.
0 commit comments