summaryrefslogtreecommitdiff
path: root/guile
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2011-08-22 18:17:10 +0200
committerLudovic Courtès <ludo@gnu.org>2011-08-22 18:18:05 +0200
commitc6c0367ab0d9131321caf136afbe8fa58d65db3b (patch)
treecbca7d4c0595c8a9cdc9de29830e2aba77e425bd /guile
parent553f000088182dd63958ad2dc8fefcb8f496f01e (diff)
downloadgnutls-c6c0367ab0d9131321caf136afbe8fa58d65db3b.tar.gz
guile: Fix `priorities' test to use `run-test'.
This is a followup to commit cd7b8102316cd4151356c4b2b7909c7435593890 ("guile: Fix tests to match the `exit' behavior introduced in Guile 2.0.1.").
Diffstat (limited to 'guile')
-rw-r--r--guile/tests/priorities.scm46
1 files changed, 20 insertions, 26 deletions
diff --git a/guile/tests/priorities.scm b/guile/tests/priorities.scm
index 1ee072be5e..2af837eb9a 100644
--- a/guile/tests/priorities.scm
+++ b/guile/tests/priorities.scm
@@ -24,6 +24,8 @@
;;;
(use-modules (gnutls)
+ (gnutls build tests)
+ (srfi srfi-1)
(srfi srfi-26))
(define %valid-priority-strings
@@ -41,10 +43,7 @@
("NONE:+VERS-TLS-ALL:+AES-128-CBC:"
. "+FAIL-HERE:+SHA1:+COMP-NULL:+SIGN-RSA-SHA1")))
-(dynamic-wind
-
- (lambda ()
- #t)
+(run-test
(lambda ()
(let ((s (make-session connection-end/client)))
@@ -52,25 +51,20 @@
(for-each (cut set-session-priorities! s <>)
%valid-priority-strings)
- (for-each (lambda (prefix+suffix)
- (let* ((prefix (car prefix+suffix))
- (suffix (cdr prefix+suffix))
- (pos (string-length prefix))
- (string (string-append prefix suffix)))
- (catch 'gnutls-error
- (lambda ()
- (let ((s (make-session connection-end/client)))
- (set-session-priorities! s string)))
- (lambda (key err function error-location . unused)
- (or (and (eq? key 'gnutls-error)
- (eq? err error/invalid-request)
- (eq? function 'set-session-priorities!)
- (= error-location pos))
- (exit 1))))))
- %invalid-priority-strings)
-
- (exit 0)))
-
- (lambda ()
- ;; failure
- (exit 1)))
+ (every (lambda (prefix+suffix)
+ (let* ((prefix (car prefix+suffix))
+ (suffix (cdr prefix+suffix))
+ (pos (string-length prefix))
+ (string (string-append prefix suffix)))
+ (catch 'gnutls-error
+ (lambda ()
+ (let ((s (make-session connection-end/client)))
+ ;; The following call should raise an exception.
+ (set-session-priorities! s string)
+ #f))
+ (lambda (key err function error-location . unused)
+ (and (eq? key 'gnutls-error)
+ (eq? err error/invalid-request)
+ (eq? function 'set-session-priorities!)
+ (= error-location pos))))))
+ %invalid-priority-strings))))