rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Avoid unnecessary use of 'mock'. 

* tests/build-utils.scm ("wrap-script, simple case"): Use the real
'which' instead of mocking it.
This commit is contained in:
Ludovic Courtès 2019-11-24 20:48:11 +01:00
parent 1d64afbdc0
commit f5698dfb87
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/build-utils.scm
View File

@ -151,11 +151,12 @@ echo hello world"))
(test-equal "wrap-script, simple case" (test-equal "wrap-script, simple case"
(string-append (string-append
(format #f "\ (format #f "\
#!GUILE --no-auto-compile #!~a --no-auto-compile
#!#; Guix wrapper #!#; Guix wrapper
#\\-~s #\\-~s
#\\-~s #\\-~s
" "
(which "guile")
'(begin (let ((current (getenv "GUIX_FOO"))) '(begin (let ((current (getenv "GUIX_FOO")))
(setenv "GUIX_FOO" (setenv "GUIX_FOO"
(if current (if current
@ -175,11 +176,9 @@ echo hello world"))
(lambda (port) (lambda (port)
(format port script-contents))) (format port script-contents)))
(chmod script-file-name #o777) (chmod script-file-name #o777)
(wrap-script script-file-name
(mock ((guix build utils) which (const "GUILE")) `("GUIX_FOO" prefix ("/some/path"
(wrap-script script-file-name "/some/other/path")))
`("GUIX_FOO" prefix ("/some/path"
"/some/other/path"))))
(let ((str (call-with-input-file script-file-name get-string-all))) (let ((str (call-with-input-file script-file-name get-string-all)))
(with-directory-excursion directory (with-directory-excursion directory
(delete-file "foo")) (delete-file "foo"))