branch rust-team updated: gnu: rust: Fix test suite on some architectures.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch rust-team
in repository guix.

The following commit(s) were added to refs/heads/rust-team by this push:
     new b677e97c9d gnu: rust: Fix test suite on some architectures.
b677e97c9d is described below

commit b677e97c9dfda433466df0a2ae6aa32f19a7d506
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Mar 8 22:07:15 2023 +0200

    gnu: rust: Fix test suite on some architectures.
    
    * gnu/packages/rust.scm (rust)[arguments]: In the custom
    'patch-process-tests phase rewrite the logic for skipping some tests so
    that it doesn't cause errors on aarch64-linux or riscv64-linux.
---
 gnu/packages/rust.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 2f3df125c8..b0fb49ae46 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -766,13 +766,11 @@ safety and thread safety guarantees.")
                    (substitute* "library/std/src/process/tests.rs"
                      (("\"/bin/sh\"")
                       (string-append "\"" bash "/bin/sh\"")))
+                   ;; The three tests which are known to fail upstream on QEMU
+                   ;; emulation on aarch64 and riscv64 also fail on x86_64 in 
Guix's
+                   ;; build system. Skip them on all builds.
                    (substitute* 
"library/std/src/sys/unix/process/process_common/tests.rs"
-                     (("fn test_process_mask")
-                      "#[ignore]\nfn test_process_mask")
-                     (("fn test_process_group_posix_spawn")
-                      "#[ignore]\nfn test_process_group_posix_spawn")
-                     (("fn test_process_group_no_posix_spawn")
-                      "#[ignore]\nfn test_process_group_no_posix_spawn")))))
+                     (("target_arch = \"arm\",") "target_os = \"linux\",")))))
              (add-after 'unpack 'disable-interrupt-tests
                (lambda _
                  ;; This test hangs in the build container; disable it.