summary refs log tree commit diff
path: root/tests/build-utils.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-11-24 20:47:20 +0100
committerLudovic Courtès <ludo@gnu.org>2019-11-26 00:16:35 +0100
commit1d64afbdc0644a2be8bd2ad157085731e212ab74 (patch)
tree8a59a81abe4e957eb6e174e6211223924f0a53af /tests/build-utils.scm
parent5d297ca6760d62f1287c9d6f4729ce3352752df8 (diff)
downloadguix-1d64afbdc0644a2be8bd2ad157085731e212ab74.tar.gz
tests: Avoid (catch 'srfi-34 …) form.
* tests/build-utils.scm ("wrap-script, raises condition"): Use 'guard'
instead of "catch 'srfi-34".
Diffstat (limited to 'tests/build-utils.scm')
-rw-r--r--tests/build-utils.scm14
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/build-utils.scm b/tests/build-utils.scm
index 61e6c44e63..ec442c267b 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)