[SCM] GNU gnutls branch, master, updated. gnutls_3_0_0-99-gc6c0367

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=c6c0367ab0d9131321caf136afbe8fa58d65db3b

The branch, master has been updated
       via  c6c0367ab0d9131321caf136afbe8fa58d65db3b (commit)
      from  553f000088182dd63958ad2dc8fefcb8f496f01e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c6c0367ab0d9131321caf136afbe8fa58d65db3b
Author: Ludovic Courtès <address@hidden>
Date:   Mon Aug 22 18:17:10 2011 +0200

    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.").

-----------------------------------------------------------------------

Summary of changes:
 guile/tests/priorities.scm |   46 +++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/guile/tests/priorities.scm b/guile/tests/priorities.scm
index 1ee072b..2af837e 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))))


hooks/post-receive
-- 
GNU gnutls