disable JIT on macos-arm64 for jit backend tests (issue 4940)

1 files changed, 8 insertions, 5 deletions

diff --git a/rpython/jit/backend/aarch64/test/conftest.py b/rpython/jit/backend/aarch64/test/conftest.py
index 1fb9f745a7..6daddd7bb9 100644
--- a/rpython/jit/backend/aarch64/test/conftest.py
+++ b/rpython/jit/backend/aarch64/test/conftest.py
@@ -3,11 +3,14 @@ This disables the backend tests on non ARM64 platforms.
 Note that you need "--slow" to run translation tests.
 """
 import os
+import sys
 import pytest
 from rpython.jit.backend import detect_cpu
 
 cpu = detect_cpu.autodetect()
 IS_ARM64 = cpu.startswith('aarch64')
+IS_MACOS = sys.platform == 'darwin'
+IS_PYPY = 'pypyjit' in sys.builtin_module_names
 THIS_DIR = os.path.dirname(__file__)
 
 @pytest.hookimpl(tryfirst=True)
@@ -17,8 +20,8 @@ def pytest_ignore_collect(path, config):
         if os.path.commonprefix([path, THIS_DIR]) == THIS_DIR:  # workaround for bug in pytest<3.0.5
             return True
 
-def pytest_collect_file():
-    if not IS_ARM64:
-        # We end up here when calling py.test .../test_foo.py with a wrong cpu
-        # It's OK to kill the whole session with the following line
-        pytest.skip("ARM64 tests skipped: cpu is %r" % (cpu,))
+if IS_ARM64 and IS_MACOS and IS_PYPY:
+    @pytest.fixture(autouse=True)
+    def disable_JIT():
+        import pypyjit
+        pypyjit.set_param("off")