nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Zsh: Patch some tests that began failing in 5.6. 

* gnu/packages/shells.scm (zsh)[arguments]: Patch the tests rather than deleting
them.
This commit is contained in:
Leo Famulari 2018-09-04 18:33:06 -04:00
parent 95681e5586
commit fcf4841c0e
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/shells.scm
View File

@ -336,11 +336,19 @@ history mechanism, job control and a C-like syntax.")
(("command -pv") "command -v") (("command -pv") "command -v")
(("command -p") "command ") (("command -p") "command ")
(("'command' -p") "'command' ")) (("'command' -p") "'command' "))
;; Several of these tests fail spuriously in the Guix ;; This file is ISO-8859-1 encoded.
;; build environment due to assumptions about PATH and (with-fluids ((%default-port-encoding #f))
;; the location of the test files. It was easier to just (substitute* "Test/A05execution.ztst"
;; skip them than try to make them work. ;; Help it find `sh`
(delete-file "Test/A05execution.ztst") (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp/ tstcmd-slashless")
(string-append "PATH=/bin:"
(assoc-ref %build-inputs "bash") "/bin:"
"${ZTST_testdir}/command.tmp/ tstcmd-slashless"))
;; Help it find `echo`
(("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp tstcmd-arg")
(string-append "PATH=/bin:"
(assoc-ref %build-inputs "coreutils") "/bin:"
"PATH=/bin:${ZTST_testdir}/command.tmp tstcmd-arg"))))
#t))))) #t)))))
(native-inputs `(("autoconf" ,autoconf))) (native-inputs `(("autoconf" ,autoconf)))
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)