[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-166-gd3a1a74

[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 Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=d3a1a74cb8764cf1f60e3d0eb0b5369cb05cf6b3

The branch, stable-2.0 has been updated
       via  d3a1a74cb8764cf1f60e3d0eb0b5369cb05cf6b3 (commit)
      from  9f6e3f5a997f484548bd03e7e7573c38a95c8d09 (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 d3a1a74cb8764cf1f60e3d0eb0b5369cb05cf6b3
Author: Ludovic Courtès <address@hidden>
Date:   Thu May 31 14:29:25 2012 +0200

    Fix port test that assumed string ports use the `error' conversion strategy.
    
    This is a followup to 9f6e3f5a997f484548bd03e7e7573c38a95c8d09 ("Have
    string ports honor `%default-port-conversion-strategy'.").
    
    * test-suite/tests/r6rs-ports.test ("7.2.11 Binary
      Output")["put-bytevector with wrong-encoding string port"]: Set
      %DEFAULT-PORT-CONVERSION-STRATEGY to 'error.  Return #f when no
      exception is raised.
      ("8.2.6  Input and output ports")["transcoded-port [error handling
      mode = raise]"]: Return #f when no exception is raised.

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

Summary of changes:
 test-suite/tests/r6rs-ports.test |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test-suite/tests/r6rs-ports.test b/test-suite/tests/r6rs-ports.test
index f3e8c2c..46da67f 100644
--- a/test-suite/tests/r6rs-ports.test
+++ b/test-suite/tests/r6rs-ports.test
@@ -1,6 +1,6 @@
 ;;;; r6rs-ports.test --- R6RS I/O port tests.   -*- coding: utf-8; -*-
 ;;;;
-;;;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+;;;; Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 ;;;; Ludovic Courtès
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
@@ -306,10 +306,12 @@
            (bv  (string->utf16 str)))
       (catch 'decoding-error
         (lambda ()
-          (with-fluids ((%default-port-encoding "UTF-32"))
+          (with-fluids ((%default-port-encoding "UTF-32")
+                        (%default-port-conversion-strategy 'error))
             (call-with-output-string
               (lambda (port)
-                (put-bytevector port bv)))))
+                (put-bytevector port bv)))
+            #f))                           ; fail if we reach this point
         (lambda (key subr message errno port)
           (string? (strerror errno)))))))
 
@@ -662,7 +664,8 @@
            (tp (transcoded-port b t)))
       (guard (c ((i/o-decoding-error? c)
                  (eq? (i/o-error-port c) tp)))
-        (get-line tp))))
+        (get-line tp)
+        #f)))                              ; fail if we reach this point
 
   (pass-if "transcoded-port [error handling mode = replace]"
     (let* ((t  (make-transcoder (utf-8-codec) (native-eol-style)


hooks/post-receive
-- 
GNU Guile