From 349cda4632cfbd0cf8a1b6d8cd451337530dc65b Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Thu, 24 Jul 2025 11:14:03 +0100
Subject: [PATCH] gnu: python-cython: Fix tests on i686-linux.

* gnu/packages/python-xyz.scm (python-cython):
  [arguments] <test-backend>: Use 'custom.
  <test-flags>: Skip one test on i686-linux.
  <phases>: Use default 'check; add 'pre-check.

Change-Id: Ia2aa75cf341f9db043c2c2bc99ed56ef6816ca21
---
 gnu/packages/python-xyz.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d8c4e11fb312a50ba91d2e99514399fa614efad8..b5ca409990e261d03cfb0b10f359ddded74823c9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10101,8 +10101,10 @@ For some datatypes the overhead can be reduced by using khash by factor 4-8.")
     (build-system pyproject-build-system)
     (arguments
      (list
+      #:test-backend #~'custom
       #:test-flags
-      #~(list "-vv"
+      #~(list "runtests.py"
+              "-vv"
               "-j" (number->string (parallel-job-count))
               "-x" (string-join
                     (list "annotate_html"
@@ -10114,11 +10116,14 @@ For some datatypes the overhead can be reduced by using khash by factor 4-8.")
                           "complex_numbers_cpp"
                           ;; This test fails when running on 24 cores.
                           "cpp_stl_conversion"
-                          ;; XXX: On 32-bit architectures, running the
-                          ;; parallel tests fails on many-core systems, see
-                          ;; <https://github.com/cython/cython/issues/2807>.
                           #$@(if (not (target-64bit?))
-                                 '("run.parallel")
+                                 ;; XXX: On 32-bit architectures, running the
+                                 ;; parallel tests fails on many-core systems.
+                                 ;; See: <https://github.com/cython/cython/issues/2807>.
+                                 '("run.parallel"
+                                   ;; Test cpp_stl_any.cast_test fails.
+                                   ;; See: <https://github.com/cython/cython/issues/5928>.
+                                   "cpp_stl_any")
                                  '())
                           #$@(if (system-hurd?)
                                  '("test_class_ref"
@@ -10128,15 +10133,13 @@ For some datatypes the overhead can be reduced by using khash by factor 4-8.")
                     "|"))
       #:phases
       #~(modify-phases %standard-phases
-          (replace 'check
+          (add-before 'check 'pre-check
             (lambda* (#:key tests? test-flags #:allow-other-keys)
               ;; Disable compiler optimizations to greatly reduce the running
               ;; time of the test suite.
               (setenv "CFLAGS" "-O0")
               ;; Some tests require access to "$HOME/.cython".
-              (setenv "HOME" "/tmp")
-              (when tests?
-                (apply invoke "python" "runtests.py" test-flags)))))))
+              (setenv "HOME" "/tmp"))))))
     (native-inputs
      (list libxcrypt
            python-setuptools