01/16: tests: Avoid (catch 'srfi-34 …) form.

[guix-commits]

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)