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

quilt: Remove test workarounds.

Browse source 
* gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch,
gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch:
New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/patchutils.scm (quilt)[source]: Use them.
[arguments]: Remove workarounds in 'patch-tests' phase.
This commit is contained in:
Eric Bavier 2018-10-03 10:23:51 -05:00
parent 227ce488d7
commit 43eb42ef01
No known key found for this signature in database
GPG key ID: FD73CAC719D32566
4 changed files with 108 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/patchutils.scm
View file

@ -103,7 +103,9 @@ listing the files modified by a patch.")
(sha256
(base32
"06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn"))
(patches (search-patches "quilt-test-fix-regex.patch"))))
(patches (search-patches "quilt-test-fix-regex.patch"
"quilt-compat-getopt-fix-second-separator.patch"
"quilt-compat-getopt-fix-option-with-nondigit-param.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gnu-gettext)))
@ -122,16 +124,6 @@ listing the files modified by a patch.")
'("test/run"
"test/edit.test")
(("/bin/sh") (which "sh")))
(substitute* "test/create-delete.test"
;; We'd rather use quilt's compat/getopt than declare a
;; dependency on util-linux, but this test fails because of
;; compat/getopt's handling of "---" in this test, so remove it
;; for now.
((" ---") ""))
(substitute* '("test/empty-files.test" "test/faildiff.test")
;; compat/getopt seems not to handle splitting of short opts
;; from its arguments.
(("-pab") "-p ab"))
#t))
(add-after 'install 'wrap-program
;; quilt's configure checks for the absolute path to the utilities it