From ed173213a5fadc896937163a2313e009ef80f37a Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Mon, 10 May 2021 17:39:47 +0200
Subject: [PATCH] [rdf,test] Suppress Apple M1 failures due to lack of JIT
exceptions.
---
test/CMakeLists.txt | 18 ++++++++++--------
tree/dataframe/test/CMakeLists.txt | 4 +++-
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 66511e61183..d1f860a3626 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -71,14 +71,16 @@ ROOT_EXECUTABLE(guitest guitest.cxx LIBRARIES RIO Gui Gpad Hist)
#ROOT_ADD_TEST(test-hsimple COMMAND hsimple)
#---invalid pointer checks---------------------------------------------------------------------
-ROOT_ADD_TEST(test-check-nullptr
- COMMAND ${ROOT_root_CMD} -b -q -l -e "int*ptr=(int*)0" -e "*ptr"
- PASSREGEX "dereference null pointer")
-
-if(NOT MSVC OR win_broken_tests)
- ROOT_ADD_TEST(test-check-invalidptr
- COMMAND ${ROOT_root_CMD} -b -q -l -e "int*ptr=(int*)1" -e "*ptr"
- PASSREGEX "invalid memory address")
+if(NOT (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64) OR M1_BROKEN_TESTS)
+ ROOT_ADD_TEST(test-check-nullptr
+ COMMAND ${ROOT_root_CMD} -b -q -l -e "int*ptr=(int*)0" -e "*ptr"
+ PASSREGEX "dereference null pointer")
+
+ if(NOT MSVC OR win_broken_tests)
+ ROOT_ADD_TEST(test-check-invalidptr
+ COMMAND ${ROOT_root_CMD} -b -q -l -e "int*ptr=(int*)1" -e "*ptr"
+ PASSREGEX "invalid memory address")
+ endif()
endif()
#--minexam-------------------------------------------------------------------------------------
diff --git a/tree/dataframe/test/CMakeLists.txt b/tree/dataframe/test/CMakeLists.txt
index b77492ba372..f1dc54dc771 100644
--- a/tree/dataframe/test/CMakeLists.txt
+++ b/tree/dataframe/test/CMakeLists.txt
@@ -25,7 +25,9 @@ if(NOT MSVC OR win_broken_tests)
ROOT_GENERATE_DICTIONARY(MaxSlotHelperDict MaxSlotHelper.h LINKDEF MaxSlotHelperLinkDef.h OPTIONS -inlineInputHeader)
ROOT_ADD_GTEST(dataframe_simple dataframe_simple.cxx MaxSlotHelperDict.cxx LIBRARIES ROOTDataFrame)
target_include_directories(dataframe_simple PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
- ROOT_ADD_GTEST(dataframe_snapshot dataframe_snapshot.cxx LIBRARIES ROOTDataFrame)
+ if(NOT (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64) OR M1_BROKEN_TESTS)
+ ROOT_ADD_GTEST(dataframe_snapshot dataframe_snapshot.cxx LIBRARIES ROOTDataFrame)
+ endif()
ROOT_ADD_GTEST(dataframe_helpers dataframe_helpers.cxx LIBRARIES ROOTDataFrame)
ROOT_ADD_GTEST(dataframe_vecops dataframe_vecops.cxx LIBRARIES ROOTDataFrame)
endif()
--
GitLab