From 4c81b10c7e5fa674e83552cfa93ba98a686541fa Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 21 May 2018 13:46:42 -0500 Subject: i18n.test: accommodate formatting changes in glibc 2.27 Look for a non-breaking space (\xa0) rather than an ASCII space as the thousands separator for the French locale. The underlying change was introduced upstream in 70a6707fa15e63591d991761be025e26e8d02bb6, i.e. https://sourceware.org/git/?p=glibc.git&a=commit&h=70a6707fa15e63591d991761be025e26e8d02bb6 Thanks to Adrian Bunk for reporting the problem. Bug-Debian: https://bugs.debian.org/896582 --- test-suite/tests/i18n.test | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test-suite/tests/i18n.test b/test-suite/tests/i18n.test index a20651120..b32de95d6 100644 --- a/test-suite/tests/i18n.test +++ b/test-suite/tests/i18n.test @@ -601,28 +601,28 @@ (with-test-prefix "French" (pass-if-equal "integer" - "123 456" + "123\xa0456" (under-french-locale-or-unresolved (lambda () (let ((fr (make-locale LC_ALL %french-locale-name))) (number->locale-string 123456 #t fr))))) (pass-if-equal "negative integer" - "-1 234 567" + "-1\xa0234\xa0567" (under-french-locale-or-unresolved (lambda () (let ((fr (make-locale LC_ALL %french-locale-name))) (number->locale-string -1234567 #t fr))))) (pass-if-equal "fraction" - "1 234,567" + "1\xa0234,567" (under-french-locale-or-unresolved (lambda () (let ((fr (make-locale LC_ALL %french-locale-name))) (number->locale-string 1234.567 #t fr))))) (pass-if-equal "fraction, 1 digit" - "1 234,6" + "1\xa0234,6" (under-french-locale-or-unresolved (lambda () (let ((fr (make-locale LC_ALL %french-locale-name))) @@ -637,7 +637,7 @@ (with-test-prefix "French" (pass-if-equal "12345.678" - "12 345,678" + "12\xa0345,678" (under-french-locale-or-unresolved (lambda () (if (null? (locale-digit-grouping %french-locale)) @@ -660,14 +660,14 @@ (with-test-prefix "French" (pass-if-equal "integer" - "123 456,00 +EUR" + "123\xa0456,00 +EUR" (under-french-locale-or-unresolved (lambda () (let ((fr (make-locale LC_ALL %french-locale-name))) (monetary-amount->locale-string 123456 #f fr))))) (pass-if-equal "fraction" - "1 234,57 EUR " + "1\xa0234,57 EUR " (under-french-locale-or-unresolved (lambda () (let ((fr (make-locale LC_ALL %french-locale-name)))