01/02: gnu: ghc-8.10: Unconditional phase 'skip-failing-tests-i686.

[guix-commits]

lbraun pushed a commit to branch wip-haskell
in repository guix.

commit e370d6046ca5c0ef2ef26c01f717d2e518ab12c8
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Sun May 8 13:44:36 2022 +0200

    gnu: ghc-8.10: Unconditional phase 'skip-failing-tests-i686.
    
    No functional changes.
    
    * gnu/packages/haskell.scm (ghc-8.10): [arguments]<#:phases>: Make
    'skip-failing-tests-i686 unconditional for all architectures.
---
 gnu/packages/haskell.scm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index effc6eeb1b..3fef20d933 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -983,20 +983,16 @@ interactive environment for the functional language 
Haskell.")
                  (("extra_files" all) (string-append "[" all))
                  (("\\]\\), " all)
                   (string-append all "expect_broken(0)], ")))))
-           ;; TODO: Turn this into an undconditional patch on the next rebuild.
-           ,@(if (string-prefix? "i686" (or (%current-target-system)
-                                                  (%current-system)))
-              '((add-after 'skip-more-tests 'skip-failing-tests-i686
-                 (lambda _
-                   (substitute* 
'("testsuite/tests/codeGen/should_compile/all.T")
-                     (("(test\\('T15155l', )when\\(unregisterised\\(\\), 
skip\\)" all before)
-                      (string-append before "when(arch('i386'), skip)")))
-                   ;; Unexpected failures:
-                   ;;    quasiquotation/T14028.run  T14028 [bad stderr] (dyn)
-                   (substitute* '("testsuite/tests/quasiquotation/all.T")
-                     (("unless\\(config.have_ext_interp, skip\\),")
-                      "unless(config.have_ext_interp, skip), 
when(arch('i386'), skip),")))))
-              '())))))
+           (add-after 'skip-more-tests 'skip-failing-tests-i686
+            (lambda _
+              (substitute* '("testsuite/tests/codeGen/should_compile/all.T")
+                (("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" 
all before)
+                 (string-append before "when(arch('i386'), skip)")))
+              ;; Unexpected failures:
+              ;;    quasiquotation/T14028.run  T14028 [bad stderr] (dyn)
+              (substitute* '("testsuite/tests/quasiquotation/all.T")
+                (("unless\\(config.have_ext_interp, skip\\),")
+                 "unless(config.have_ext_interp, skip), when(arch('i386'), 
skip),"))))))))
     (native-search-paths (list (search-path-specification
                                 (variable "GHC_PACKAGE_PATH")
                                 (files (list