[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/10: gnu: ghc-8.10: Add phase unconditionally.
From: |
guix-commits |
Subject: |
08/10: gnu: ghc-8.10: Add phase unconditionally. |
Date: |
Tue, 23 Aug 2022 11:05:41 -0400 (EDT) |
efraim pushed a commit to branch staging
in repository guix.
commit b94534adf0fcbdcba92819e6b80c87d5dc228351
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Aug 22 10:37:00 2022 +0300
gnu: ghc-8.10: Add phase unconditionally.
* gnu/packages/haskell.scm (ghc-8.10)[arguments]: Apply custom
'skip-failing-tests-i686 phase 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 984aa33f6e..b99984406b 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -910,20 +910,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
- branch staging updated (213c60f332 -> 47316120b7), guix-commits, 2022/08/23
- 08/10: gnu: ghc-8.10: Add phase unconditionally.,
guix-commits <=
- 10/10: gnu: ghc-8.10: Build using ghc-8.6., guix-commits, 2022/08/23
- 06/10: gnu: ghc-8.6: Rewrite using G-exps., guix-commits, 2022/08/23
- 02/10: gnu: ghc-7: Unpack tarballs from the store., guix-commits, 2022/08/23
- 03/10: gnu: ghc-7: Update to 7.10.3., guix-commits, 2022/08/23
- 01/10: gnu: ghc-7: Rewrite arguments using G-expressions., guix-commits, 2022/08/23
- 09/10: gnu: ghc-8.10: Rewrite using G-exps., guix-commits, 2022/08/23
- 05/10: gnu: ghc-8.4: Modernize package., guix-commits, 2022/08/23
- 04/10: gnu: ghc-8.0: Modernize package., guix-commits, 2022/08/23
- 07/10: gnu: ghc-8.8: Rewrite using G-exps., guix-commits, 2022/08/23