[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/16: tests: Avoid unnecessary use of 'mock'.
From: |
guix-commits |
Subject: |
02/16: tests: Avoid unnecessary use of 'mock'. |
Date: |
Mon, 25 Nov 2019 18:17:07 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit f5698dfb87df1132ca5c73a8ed7f75f63c07669f
Author: Ludovic Courtès <address@hidden>
Date: Sun Nov 24 20:48:11 2019 +0100
tests: Avoid unnecessary use of 'mock'.
* tests/build-utils.scm ("wrap-script, simple case"): Use the real
'which' instead of mocking it.
---
tests/build-utils.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/tests/build-utils.scm b/tests/build-utils.scm
index ec442c2..47a57a9 100644
--- a/tests/build-utils.scm
+++ b/tests/build-utils.scm
@@ -151,11 +151,12 @@ echo hello world"))
(test-equal "wrap-script, simple case"
(string-append
(format #f "\
-#!GUILE --no-auto-compile
+#!~a --no-auto-compile
#!#; Guix wrapper
#\\-~s
#\\-~s
"
+ (which "guile")
'(begin (let ((current (getenv "GUIX_FOO")))
(setenv "GUIX_FOO"
(if current
@@ -175,11 +176,9 @@ echo hello world"))
(lambda (port)
(format port script-contents)))
(chmod script-file-name #o777)
-
- (mock ((guix build utils) which (const "GUILE"))
- (wrap-script script-file-name
- `("GUIX_FOO" prefix ("/some/path"
- "/some/other/path"))))
+ (wrap-script script-file-name
+ `("GUIX_FOO" prefix ("/some/path"
+ "/some/other/path")))
(let ((str (call-with-input-file script-file-name get-string-all)))
(with-directory-excursion directory
(delete-file "foo"))
- branch master updated (5d297ca -> 54a80b5), guix-commits, 2019/11/25
- 01/16: tests: Avoid (catch 'srfi-34 …) form., guix-commits, 2019/11/25
- 07/16: doc: cookbook: Add cross-references to the Guile manual., guix-commits, 2019/11/25
- 06/16: doc: cookbook: Use @result{} & co. instead of a '>' prompt., guix-commits, 2019/11/25
- 03/16: doc: cookbook: Use @lisp for Scheme snippets., guix-commits, 2019/11/25
- 09/16: Use 'offload?' instead of 'build-hook?' internally., guix-commits, 2019/11/25
- 14/16: gnu: Add libdbi., guix-commits, 2019/11/25
- 08/16: guix build, daemon: Rename "--no-build-hook" to "--no-offload"., guix-commits, 2019/11/25
- 12/16: gnu: Add libhx., guix-commits, 2019/11/25
- 10/16: guix build: '--keep-failed' implies '--no-offload'., guix-commits, 2019/11/25
- 02/16: tests: Avoid unnecessary use of 'mock'.,
guix-commits <=
- 04/16: doc: cookbook: Add cross-reference about ./pre-inst-env., guix-commits, 2019/11/25
- 11/16: daemon: boost::format: Fix typo "referred"., guix-commits, 2019/11/25
- 16/16: gnu: gnucash: Activate database support., guix-commits, 2019/11/25
- 13/16: gnu: Add pam-mount., guix-commits, 2019/11/25
- 05/16: doc: cookbook: Use Texinfo quotes., guix-commits, 2019/11/25
- 15/16: gnu: Add libdbi-drivers., guix-commits, 2019/11/25