From 9e116166d4c21a1429858db4e1c7f84e063303e9 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Fri, 22 May 2026 09:19:18 +0200 Subject: [PATCH] [DF] Enable RDataFrame exception tests also on macOS Now that catching exceptions through interpreted code on Apple silicon is possible, the RDataFrame tests that require this functionality can be unconditionally enabled on macOS again. See also commit 9d097fbb5b17 and ROOT GitHub issue https://github.com/root-project/root/issues/7541. --- tree/dataframe/test/dataframe_vary.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tree/dataframe/test/dataframe_vary.cxx b/tree/dataframe/test/dataframe_vary.cxx index 4d4a990eb2ed7..499159425240d 100644 --- a/tree/dataframe/test/dataframe_vary.cxx +++ b/tree/dataframe/test/dataframe_vary.cxx @@ -128,9 +128,8 @@ TEST(RDFVary, RequireVariationsHaveConsistentType) std::runtime_error); } -// throwing exceptions from jitted code cause problems on windows and MacOS+M1 +// throwing exceptions from jitted code cause problems on windows #if !defined(_MSC_VER) || defined(R__ENABLE_BROKEN_WIN_TESTS) -#if !(defined(R__MACOSX) && defined(__arm64__)) TEST(RDFVary, RequireVariationsHaveConsistentTypeJitted) { // non-jitted Define, jitted Vary with incompatible type @@ -230,7 +229,6 @@ TEST(RDFVaryDeathTest, JitFailureThrowsInsteadOfCrashing) ::testing::ExitedWithCode(0), ""); } #endif -#endif TEST(RDFVary, RequireReturnTypeIsRVec) {