amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Use argument for test exclusion.

Browse source 
* gnu/packages/fontutils.scm (fontforge, graphite2)
[arguments]<#:test-exclude>: Move regex from custom 'check phase.

Change-Id: I51d1480b9fd87b7e32b7d09e24b73c9d93729b8d
This commit is contained in:
Greg Hogan 2025-04-03 13:13:47 +00:00
parent 6d40d0b795
commit 1608cd16a4
No known key found for this signature in database
GPG key ID: EF6EB27413CFEEF3
1 changed files with 49 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

128
gnu/packages/fontutils.scm
View file

@ -1536,22 +1536,7 @@ translated keywords and acts.")
(list freetype)) (list freetype))
(arguments (arguments
(if (system-hurd?) (if (system-hurd?)
(list (list #:test-exclude "awamicmp3")
#:phases
#~(modify-phases %standard-phases
(replace 'check
;; cmake-build-system ignores #:make-flags for make check
(lambda* (#:key test-target tests? parallel-tests?
#:allow-other-keys)
(if tests?
(let ((jobs (if parallel-tests?
(number->string (parallel-job-count))
"1")))
(invoke "make"
(string-append
"ARGS=-j " jobs " --exclude-regex ^awamicmp3$")
test-target))
(format #t "test suite not run~%"))))))
'())) '()))
(synopsis "Reimplementation of the SIL Graphite text processing engine") (synopsis "Reimplementation of the SIL Graphite text processing engine")
(description (description
@ -1731,69 +1716,54 @@ definitions.")
python python
zlib)) zlib))
(arguments (arguments
(list (append
#:configure-flags #~`(;; TODO: Provide GTK+ for the Wayland-friendly GDK (if (system-hurd?)
;; backend, instead of the legacy X11 backend. (list #:test-exclude "test0001_py|test0001_pyhook")
;; Currently it introduces a circular dependency. '())
"-DENABLE_X11=ON") (list
#:phases #:configure-flags #~`(;; TODO: Provide GTK+ for the Wayland-friendly GDK
#~(modify-phases %standard-phases ;; backend, instead of the legacy X11 backend.
(add-after 'unpack 'do-not-override-RPATH ;; Currently it introduces a circular dependency.
(lambda _ "-DENABLE_X11=ON")
;; Do not attempt to set a default RPATH, as our ld-wrapper #:phases
;; already does the right thing. #~(modify-phases %standard-phases
(substitute* "CMakeLists.txt" (add-after 'unpack 'do-not-override-RPATH
(("^set_default_rpath\\(\\)") (lambda _
"")))) ;; Do not attempt to set a default RPATH, as our ld-wrapper
(add-after 'unpack 'do-not-use-msgfmt--check ;; already does the right thing.
(lambda _ (substitute* "CMakeLists.txt"
;; msgfmt --check from gettext-0.23 fails on fr.po: (("^set_default_rpath\\(\\)")
;; 'msgstr' is not a valid C format string ""))))
(substitute* "po/CMakeLists.txt" (add-after 'unpack 'do-not-use-msgfmt--check
((" --check") "")))) (lambda _
#$@(if (target-hurd?) ;; msgfmt --check from gettext-0.23 fails on fr.po:
#~((add-after 'unpack 'apply-hurd-patch ;; 'msgstr' is not a valid C format string
(lambda _ (substitute* "po/CMakeLists.txt"
(let ((patch-file ((" --check") ""))))
#$(local-file #$@(if (target-hurd?)
(search-patch "fontforge-hurd.patch")))) #~((add-after 'unpack 'apply-hurd-patch
(invoke "patch" "--force" "-p1" "-i" patch-file))))) (lambda _
#~()) (let ((patch-file
#$@(if (system-hurd?) #$(local-file
#~((replace 'check (search-patch "fontforge-hurd.patch"))))
;; cmake-build-system ignores #:make-flags for make check (invoke "patch" "--force" "-p1" "-i" patch-file)))))
(lambda* (#:key test-target tests? parallel-tests? #~())
#:allow-other-keys) (add-after 'install 'set-library-path
(let ((skip '("test0001_py" "test0001_pyhook"))) (lambda* (#:key inputs outputs #:allow-other-keys)
(if tests? (let ((out (assoc-ref outputs "out"))
(let ((jobs (potrace (dirname
(if parallel-tests? (search-input-file inputs "bin/potrace"))))
(number->string (parallel-job-count)) (wrap-program (string-append out "/bin/fontforge")
"1"))) ;; Fontforge dynamically opens libraries.
(invoke "make" `("LD_LIBRARY_PATH" ":" prefix
(string-append "ARGS=-j " jobs ,(map (lambda (input)
" --exclude-regex ^" (string-append (assoc-ref inputs input)
(string-join skip "\\|") "/lib"))
"$") '("libtiff" "libjpeg-turbo" "libpng" "libungif"
test-target)) "libxml2" "zlib" "libspiro" "freetype"
(format #t "test suite not run~%")))))) "pango" "cairo" "fontconfig-minimal")))
#~()) ;; Checks for potrace program at runtime
(add-after 'install 'set-library-path `("PATH" ":" prefix (,potrace))))))))))
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(potrace (dirname
(search-input-file inputs "bin/potrace"))))
(wrap-program (string-append out "/bin/fontforge")
;; Fontforge dynamically opens libraries.
`("LD_LIBRARY_PATH" ":" prefix
,(map (lambda (input)
(string-append (assoc-ref inputs input)
"/lib"))
'("libtiff" "libjpeg-turbo" "libpng" "libungif"
"libxml2" "zlib" "libspiro" "freetype"
"pango" "cairo" "fontconfig-minimal")))
;; Checks for potrace program at runtime
`("PATH" ":" prefix (,potrace)))))))))
(synopsis "Outline font editor") (synopsis "Outline font editor")
(description (description
"FontForge allows you to create and modify postscript, truetype and "FontForge allows you to create and modify postscript, truetype and