tests: Avoid (catch 'srfi-34 …) form.
authorLudovic Courtès <ludo@gnu.org>
Sun, 24 Nov 2019 19:47:20 +0000 (20:47 +0100)
committerLudovic Courtès <ludo@gnu.org>
Mon, 25 Nov 2019 23:16:35 +0000 (00:16 +0100)
* tests/build-utils.scm ("wrap-script, raises condition"): Use 'guard'
instead of "catch 'srfi-34".

tests/build-utils.scm

index 61e6c44..ec442c2 100644 (file)
@@ -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)