branch master updated: gnu: ghc: Disable failing test on i686

[guix-commits]

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

lbraun pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 086e426d20 gnu: ghc: Disable failing test on i686
086e426d20 is described below

commit 086e426d20e84be90f2066b4b5d51f24df7441cf
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Mon Feb 27 19:49:03 2023 +0100

    gnu: ghc: Disable failing test on i686
    
    Conditionally, so we don’t rebuild GHC on amd64.
    
    * gnu/packages/haskell.scm (ghc-9.2)[arguments]: Conditionally add phase
    'skip-T21694-i686.
---
 gnu/packages/haskell.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 3406161c7c..16f4e2d530 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1296,7 +1296,16 @@ interactive environment for the functional language 
Haskell.")
              (replace 'fix-cc-reference
                (lambda _
                  (substitute* "utils/hsc2hs/src/Common.hs"
-                   (("\"cc\"") "\"gcc\""))))))
+                   (("\"cc\"") "\"gcc\""))))
+             ;; FIXME: Remove i686-specific match on the next rebuild cycle.
+             #$@(match (%current-system)
+                  ("i686-linux"
+                    #~((add-after 'skip-more-tests 'skip-T21694-i686
+                        (lambda _
+                          (substitute* 
'("testsuite/tests/simplCore/should_compile/all.T")
+                            (("^test\\('T21694', \\[ " all)
+                             (string-append all "when(arch('i386'), skip), 
")))))))
+                  (_ #~()))))
          ;; Increase verbosity, so running the test suite does not time out on 
CI.
          ((#:make-flags make-flags ''())
           #~(cons "VERBOSE=4" #$make-flags))))