From dec84a0a6e164d7c92982ea78c27e85df56ed477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 4 Mar 2010 11:32:51 +0100 Subject: [PATCH] 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. --- 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 bb7797fcd..0031bbf4c 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 bc785abfa..a6844cac9 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