branch master updated: gnu: ghc-8.10: Avoid testsuite timeouts 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 c354a345b9 gnu: ghc-8.10: Avoid testsuite timeouts on i686.
c354a345b9 is described below

commit c354a345b9a75f9c298a9d13e9832314c6795ccb
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Tue Apr 25 16:40:44 2023 +0200

    gnu: ghc-8.10: Avoid testsuite timeouts on i686.
    
    * gnu/packages/haskell.scm (ghc-8.10)[arguments]: Add new phase
    'skip-failing-tests-i686-cuirass.
---
 gnu/packages/haskell.scm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 5f2e36b9ba..6b2c86fec4 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1261,7 +1261,24 @@ interactive environment for the functional language 
Haskell.")
                ;;    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),"))))))))
+                  "unless(config.have_ext_interp, skip), when(arch('i386'), 
skip),"))))
+           ;; i686 fails on CI, but (sometimes and with generous timeouts) 
completes
+           ;; locally. The issue seems to be that the testsuite tries to run 
some very
+           ;; broad regular expressions on output files of several megabytes 
in size,
+           ;; which takes a long time. Since the expressions never match 
anything on
+           ;; our builds anyways, remove them.
+           ;; TODO: Merge with 'skip-failing-tests-i686 or move into snippets 
on
+           ;; next rebuild. Note that they are required for GHC 8.10 and 9.2.
+           #$@(if (string-prefix? "i686" (or (%current-target-system)
+                                             (%current-system)))
+               #~((add-after 'skip-failing-tests-i686 
'skip-failing-tests-i686-cuirass
+                    (lambda _
+                      (substitute* '("testsuite/driver/testlib.py")
+                        ((".*changes being made to the file will invalidate 
the code signature.*")
+                         "")
+                        ((".*warning: argument unused during compilation:.*")
+                         "")))))
+               #~())))))
     (native-search-paths (list (search-path-specification
                                 (variable "GHC_PACKAGE_PATH")
                                 (files (list