branch master updated: gnu: guix: Fix test suite on riscv64-linux.

[guix-commits]

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

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 91bbed89b5 gnu: guix: Fix test suite on riscv64-linux.
91bbed89b5 is described below

commit 91bbed89b52eb64ee2388bf58be44eb5ae6a9dbb
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Mar 21 09:14:43 2022 +0200

    gnu: guix: Fix test suite on riscv64-linux.
    
    * gnu/packages/package-management.scm (guix)[arguments]: Add phase when
    building for riscv64-linux to adjust the test suite.
---
 gnu/packages/package-management.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index d2bffa3f97..491423d41e 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -239,6 +239,12 @@ $(prefix)/etc/init.d\n")))
 $(prefix)/etc/openrc\n")))
 
                         (invoke "sh" "bootstrap")))
+                    ,@(if (target-riscv64?)
+                        `((add-after 'unpack 
'use-correct-guile-version-for-tests
+                            (lambda _
+                              (substitute* "tests/gexp.scm"
+                                (("2\\.0") "3.0")))))
+                        '())
                     (add-before 'build 'use-host-compressors
                       (lambda* (#:key inputs target #:allow-other-keys)
                         (when target