From e93d4cb20da7fd9e30a53a867e4b8f37a8eafc93 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Fri, 2 Oct 2026 05:15:14 +0000 Subject: [PATCH] [cppyy] Remove xfail for addressof method test on modules=OFF with C++17 Since the nightly of 2026-09-29, TestDATATYPES.test49_addressof_method passes again on the alma9 modules_off build, after failing consistently since the xfail was added in January. The transition window (04c4c5c..b6a95ff, including the LLVM tag bump) contains no commit that fixes the kind of AST-level specialization confusion seen in issue #21005, so the recovery is most likely an incidental PCH-content layout shift rather than a root-cause fix. Meanwhile, the strict xfail now fails the nightly suite with XPASS(strict), so it has to go either way. The unrelated macOS-ARM xfail condition is kept, and the now-unused is_modules_off helper and has_cpp_20 import are removed. Closes #21005. --- bindings/pyroot/cppyy/cppyy/test/test_datatypes.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/bindings/pyroot/cppyy/cppyy/test/test_datatypes.py b/bindings/pyroot/cppyy/cppyy/test/test_datatypes.py index a26d5892ae72a..71e26dd1d9b22 100644 --- a/bindings/pyroot/cppyy/cppyy/test/test_datatypes.py +++ b/bindings/pyroot/cppyy/cppyy/test/test_datatypes.py @@ -1,16 +1,10 @@ import sys, pytest, os from pytest import mark, raises, skip -from support import setup_make, pylong, pyunicode, IS_MAC, IS_MAC_ARM, IS_WINDOWS, has_cpp_20 +from support import setup_make, pylong, pyunicode, IS_MAC, IS_MAC_ARM, IS_WINDOWS test_dct = "datatypes_cxx" -def is_modules_off(): - import cppyy - - return "runtime_cxxmodules" not in cppyy.gbl.gROOT.GetConfigFeatures() - - class TestDATATYPES: def setup_class(cls): import cppyy @@ -2345,8 +2339,7 @@ def test48_bool_typemap(self): assert str(bt(1)) == 'True' assert str(bt(0)) == 'False' - @mark.xfail(strict=True, run=not IS_WINDOWS, condition=IS_MAC_ARM or (not has_cpp_20() and is_modules_off()), reason="Crashes on mac-beta ARM64 and fails on Windows \ - assertion error for runtime_cxxmodules=OFF build that is explained in GitHub issue #21005") + @mark.xfail(strict=True, run=not IS_WINDOWS, condition=IS_MAC_ARM, reason="Crashes on mac-beta ARM64 and fails on Windows") def test49_addressof_method(self): """Use of addressof for (const) methods"""