guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-8-67-gdec


From: Ludovic Courtès
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-8-67-gdec84a0
Date: Thu, 04 Mar 2010 10:33:00 +0000

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=dec84a0a6e164d7c92982ea78c27e85df56ed477

The branch, master has been updated
       via  dec84a0a6e164d7c92982ea78c27e85df56ed477 (commit)
      from  87bc7c81650fef2ee8bc83bceab6ea565a47f2b5 (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 dec84a0a6e164d7c92982ea78c27e85df56ed477
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 4 11:32:51 2010 +0100

    Try to avoid `guile-test' failures when it can't display the name of a test.
    
    This can happen, e.g., when printing "UNRESOLVED: regexp.test: TEST-NAME",
    where TEST-NAME contains characters that cannot be converted to the
    encoding of the current output or error port.
    
    * test-suite/guile-test (main): Set the conversion strategy for the
      output and error ports to `escape'.
    
    * test-suite/tests/regexp.test (current-output-port): Likewise.

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

Summary of changes:
 test-suite/guile-test        |    4 ++++
 test-suite/tests/regexp.test |    6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/test-suite/guile-test b/test-suite/guile-test
index bb7797f..0031bbf 100755
--- a/test-suite/guile-test
+++ b/test-suite/guile-test
@@ -208,6 +208,10 @@
         ;; Allow for arbitrary Unicode characters in the log file.
         (set-port-encoding! log-port "UTF-8")
 
+        ;; Don't fail if we can't display a test name to stdout/stderr.
+        (set-port-conversion-strategy! (current-output-port) 'escape)
+        (set-port-conversion-strategy! (current-error-port) 'escape)
+
        ;; Register some reporters.
        (let ((global-pass #t)
              (counter (make-count-reporter)))
diff --git a/test-suite/tests/regexp.test b/test-suite/tests/regexp.test
index bc785ab..a6844ca 100644
--- a/test-suite/tests/regexp.test
+++ b/test-suite/tests/regexp.test
@@ -22,11 +22,13 @@
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 regex))
 
-(set-port-conversion-strategy! (current-output-port) 'escape)
-
 (if (defined? 'setlocale)
     (setlocale LC_ALL "C"))
 
+;; Don't fail if we can't display a test name to stdout/stderr.
+(set-port-conversion-strategy! (current-output-port) 'escape)
+(set-port-conversion-strategy! (current-error-port) 'escape)
+
 
 ;;; Run a regexp-substitute or regexp-substitute/global test, once
 ;;; providing a real port and once providing #f, requesting direct


hooks/post-receive
-- 
GNU Guile




reply via email to

[Prev in Thread] Current Thread [Next in Thread]