[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-28-g13fb25b

[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=13fb25ba0c24a9e7732d2c32dbc882c7d462bce9

The branch, stable-2.0 has been updated
       via  13fb25ba0c24a9e7732d2c32dbc882c7d462bce9 (commit)
      from  bc02028b52297bd33247435a573b76a873b2f4ba (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 13fb25ba0c24a9e7732d2c32dbc882c7d462bce9
Author: Ludovic Courtès <address@hidden>
Date:   Sat Feb 4 23:38:47 2012 +0100

    i18n: Skips ~h `format' tests when digit grouping info is missing.
    
    * test-suite/tests/i18n.test ("format ~h"): Skip tests when
      `locale-digit-grouping' returns '().

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

Summary of changes:
 test-suite/tests/i18n.test |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/test-suite/tests/i18n.test b/test-suite/tests/i18n.test
index 335f450..ef08dd4 100644
--- a/test-suite/tests/i18n.test
+++ b/test-suite/tests/i18n.test
@@ -495,22 +495,30 @@
 
 (with-test-prefix "format ~h"
 
+  ;; Some systems like Darwin lack the `GROUPING' nl_item, and thus
+  ;; `locale-digit-grouping' defaults to '(); skip the tests in that
+  ;; case.
+
   (with-test-prefix "French"
 
     (pass-if "12345.5678"
       (under-french-locale-or-unresolved
        (lambda ()
-         (string=? "12 345,6789"
-                   (format #f "~:h" 12345.6789 %french-locale))))))
+         (if (null? (locale-digit-grouping %french-locale))
+             (throw 'unresolved)
+             (string=? "12 345,6789"
+                       (format #f "~:h" 12345.6789 %french-locale)))))))
 
   (with-test-prefix "English"
 
     (pass-if "12345.5678"
       (under-american-english-locale-or-unresolved
        (lambda ()
-         (string=? "12,345.6789"
-                   (format #f "~:h" 12345.6789
-                           %american-english-locale)))))))
+         (if (null? (locale-digit-grouping %american-english-locale))
+             (throw 'unresolved)
+             (string=? "12,345.6789"
+                       (format #f "~:h" 12345.6789
+                               %american-english-locale))))))))
 
 (with-test-prefix "monetary-amount->locale-string"
 


hooks/post-receive
-- 
GNU Guile