[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/16: tests: Avoid (catch 'srfi-34 …) form.
From: |
guix-commits |
Subject: |
01/16: tests: Avoid (catch 'srfi-34 …) form. |
Date: |
Mon, 25 Nov 2019 18:17:07 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 1d64afbdc0644a2be8bd2ad157085731e212ab74
Author: Ludovic Courtès <address@hidden>
Date: Sun Nov 24 20:47:20 2019 +0100
tests: Avoid (catch 'srfi-34 …) form.
* tests/build-utils.scm ("wrap-script, raises condition"): Use 'guard'
instead of "catch 'srfi-34".
---
tests/build-utils.scm | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/tests/build-utils.scm b/tests/build-utils.scm
index 61e6c44..ec442c2 100644
--- a/tests/build-utils.scm
+++ b/tests/build-utils.scm
@@ -235,13 +235,11 @@ print('hello world')"))
(lambda (port)
(format port "This is not a script")))
(chmod script-file-name #o777)
- (catch 'srfi-34
- (lambda ()
- (wrap-script script-file-name
- #:guile "MYGUILE"
- `("GUIX_FOO" prefix ("/some/path"
- "/some/other/path"))))
- (lambda (type obj)
- (wrap-error? obj)))))))
+ (guard (c ((wrap-error? c) #t))
+ (wrap-script script-file-name
+ #:guile "MYGUILE"
+ `("GUIX_FOO" prefix ("/some/path"
+ "/some/other/path")))
+ #f)))))
(test-end)
- branch master updated (5d297ca -> 54a80b5), guix-commits, 2019/11/25
- 01/16: tests: Avoid (catch 'srfi-34 …) form.,
guix-commits <=
- 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, 2019/11/25
- 04/16: doc: cookbook: Add cross-reference about ./pre-inst-env., guix-commits, 2019/11/25