[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-77-ge2c6bf3

[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=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f

The branch, stable-2.0 has been updated
       via  e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f (commit)
       via  8364ae3fac3645ad3e8b53a2c4faeeed162ea0ea (commit)
      from  ceb7f9cc126f50e0cc8956b80ac5d111580b23c8 (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 e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f
Author: Ludovic Courtès <address@hidden>
Date:   Fri Feb 1 18:19:27 2013 +0100

    guild: Gracefully handle failures to install the locale.
    
    * meta/guild.in (main): Catch `system-error' when calling `setlocale',
      and gracefully handle any error.

commit 8364ae3fac3645ad3e8b53a2c4faeeed162ea0ea
Author: Ludovic Courtès <address@hidden>
Date:   Fri Feb 1 18:17:09 2013 +0100

    Skip FFI tests that rely on `-export-dynamic' behavior when not available.
    
    * test-suite/tests/foreign.test ("make-pointer")["equal? modulo
      finalizer", "equal? modulo finalizer (set-pointer-finalizer!)"]: Skip
      when `scm_is_pair' cannot be found, as is the case on Cygwin.
      Reported by "objc" <address@hidden>.

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

Summary of changes:
 meta/guild.in                 |   10 ++++++++--
 test-suite/tests/foreign.test |   15 ++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/meta/guild.in b/meta/guild.in
index 183323f..d501a0d 100755
--- a/meta/guild.in
+++ b/meta/guild.in
@@ -8,7 +8,7 @@ exec ${GUILE:address@hidden@/@address@hidden $GUILE_FLAGS -e 
'(@@ (guild) main)'
 ;;;; guild --- running scripts bundled with Guile
 ;;;; Andy Wingo <address@hidden> --- April 2009
 ;;;; 
-;;;;   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+;;;;   Copyright (C) 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -51,7 +51,13 @@ exec ${GUILE:address@hidden@/@address@hidden $GUILE_FLAGS -e 
'(@@ (guild) main)'
 
 (define (main args)
   (if (defined? 'setlocale)
-      (setlocale LC_ALL ""))
+      (catch 'system-error
+        (lambda ()
+          (setlocale LC_ALL ""))
+        (lambda args
+          (format (current-error-port)
+                  "warning: failed to install locale: ~a~%"
+                  (strerror (system-error-errno args))))))
 
   (let* ((options (getopt-long args *option-grammar*
                                #:stop-at-first-non-option #t))
diff --git a/test-suite/tests/foreign.test b/test-suite/tests/foreign.test
index 60d8630..540effb 100644
--- a/test-suite/tests/foreign.test
+++ b/test-suite/tests/foreign.test
@@ -1,6 +1,6 @@
 ;;;; foreign.test --- FFI.           -*- mode: scheme; coding: utf-8; -*-
 ;;;;
-;;;;   Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
+;;;;   Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -69,14 +69,19 @@
 
   (pass-if "equal? modulo finalizer"
     (let ((finalizer (dynamic-func "scm_is_pair" (dynamic-link))))
-      (equal? (make-pointer 123)
-              (make-pointer 123 finalizer))))
+      (if (not finalizer)
+          (throw 'unresolved)                     ; probably Windows
+          (equal? (make-pointer 123)
+                  (make-pointer 123 finalizer)))))
 
   (pass-if "equal? modulo finalizer (set-pointer-finalizer!)"
     (let ((finalizer (dynamic-func "scm_is_pair" (dynamic-link)))
           (ptr       (make-pointer 123)))
-      (set-pointer-finalizer! ptr finalizer)
-      (equal? (make-pointer 123) ptr)))
+      (if (not finalizer)
+          (throw 'unresolved)                     ; probably Windows
+          (begin
+            (set-pointer-finalizer! ptr finalizer)
+            (equal? (make-pointer 123) ptr)))))
 
   (pass-if "not equal?"
     (not (equal? (make-pointer 123) (make-pointer 456)))))


hooks/post-receive
-- 
GNU Guile