Skip to content

Commit cbe2636

Browse files
committed
[adaptivecpp] Fix failing tests with adaptiveCpp
AdaptiveCpp requires NullDerefProtectionTransformer to be turned off to function properly
1 parent 4f0c118 commit cbe2636

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

bindings/pyroot/pythonizations/test/import_load_libs.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ class ImportLoadLibs(unittest.TestCase):
2929
'librt',
3030
'libncurses.*',
3131
'libtinfo', # by libncurses (on some older platforms)
32+
# adaptivecpp and dependencies
33+
'libacpp-rt',
34+
'libgomp',
3235
# libTree and dependencies
3336
'libTree',
3437
'libThread',

roottest/cling/exception/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if(NOT MSVC OR win_broken_tests)
1+
if((NOT MSVC OR win_broken_tests) AND NOT experimental_adaptivecpp)
22
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64.*|x86.*|amd64.*|AMD64.*|i686.*|i386.*")
33
# All platforms except of ARM/AARCH64
44
set(RootExeOptions "--ptrcheck")
@@ -9,7 +9,7 @@ if(NOT MSVC OR win_broken_tests)
99
endif()
1010
endif()
1111

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)
1313
ROOTTEST_ADD_TEST(nullderef-e
1414
COMMAND ${ROOT_root_CMD} -l -b -q --ptrcheck -e "int*p=nullptr" -e "*p"
1515
PASSRC 1

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ ROOT_EXECUTABLE(guitest guitest.cxx LIBRARIES RIO Gui Gpad Hist)
7575
#ROOT_ADD_TEST(test-hsimple COMMAND hsimple)
7676

7777
#---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)
7979
ROOT_ADD_TEST(test-check-nullptr
8080
COMMAND ${ROOT_root_CMD} -b -q -l --ptrcheck -e "int*ptr=(int*)0" -e "*ptr"
8181
PASSREGEX "dereference null pointer")

0 commit comments

Comments
 (0)