From 086e426d20e84be90f2066b4b5d51f24df7441cf Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 27 Feb 2023 19:49:03 +0100 Subject: gnu: ghc: Disable failing test on i686 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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)))) -- cgit v1.2.3