me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ghc-8.10: Add phase unconditionally.

Browse source 
* gnu/packages/haskell.scm (ghc-8.10)[arguments]: Apply custom
'skip-failing-tests-i686 phase for all architectures.
This commit is contained in:
Efraim Flashner 2022-08-22 10:37:00 +03:00
parent 9e26302773
commit b94534adf0
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/haskell.scm
View file

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