[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-254-g4702deb

[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=4702deb424633ad02c495c01d950b973c0ead8ea

The branch, stable-2.0 has been updated
       via  4702deb424633ad02c495c01d950b973c0ead8ea (commit)
       via  465ff50245e0f5deb26612ac7401b51c415deeb0 (commit)
       via  2a7d614cc0bc902895cdb873590e8a24cf680368 (commit)
      from  8d6e3dd83a09f35a18774baa696ba443aa379cbb (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 4702deb424633ad02c495c01d950b973c0ead8ea
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 28 23:33:44 2013 +0100

    tests: Skip `test-pthread-create-secondary' except on Linux-based systems.
    
    * test-suite/standalone/test-pthread-create-secondary.c: Skip on
      non-Linux-based systems.

commit 465ff50245e0f5deb26612ac7401b51c415deeb0
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 28 22:53:59 2013 +0100

    build: Require GMP >= 4.2.
    
    * NEWS, README: Update.

commit 2a7d614cc0bc902895cdb873590e8a24cf680368
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 28 22:42:24 2013 +0100

    tests: Fix file name canonicalization tests for when $srcdir contains 
symlinks.
    
    * test-suite/tests/ports.test ("%file-port-name-canonicalization"): Use
      `pass-if-equal' instead of `pass-if'.
      ["relative canonicalization from ice-9"]: Throw to `unresolved' when
      %LOAD-PATH is not canonical.
      ["absolute canonicalization from ice-9"]: Canonicalize the result.

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

Summary of changes:
 NEWS                                               |    5 ++
 README                                             |    2 +-
 .../standalone/test-pthread-create-secondary.c     |   19 +++++---
 test-suite/tests/ports.test                        |   50 ++++++++++---------
 4 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/NEWS b/NEWS
index dbabdd3..92dc19f 100644
--- a/NEWS
+++ b/NEWS
@@ -93,6 +93,11 @@ more information.
 
 ** Update predefined character sets to Unicode 6.2.
 
+** GMP 4.2 or later required
+
+Guile used to require GMP at least version 4.1 (released in May 2002),
+and now requires at least version 4.2 (released in March 2006).
+
 * Manual updates
 
 ** Better SXML documentation.
diff --git a/README b/README
index 31fdb80..480ef66 100644
--- a/README
+++ b/README
@@ -62,7 +62,7 @@ Required External Packages 
================================================
 
 Guile requires the following external packages:
 
-  - GNU MP, at least version 4.1
+  - GNU MP, at least version 4.2
 
     GNU MP is used for bignum arithmetic.  It is available from
     http://gmplib.org/ .
diff --git a/test-suite/standalone/test-pthread-create-secondary.c 
b/test-suite/standalone/test-pthread-create-secondary.c
index e145fa5..14ea240 100644
--- a/test-suite/standalone/test-pthread-create-secondary.c
+++ b/test-suite/standalone/test-pthread-create-secondary.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 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 License
@@ -30,15 +30,20 @@
 #include <gc/gc.h>
 
 
-/* Up to GC 7.2alpha5, calling `GC_INIT' from a secondary thread would
+/* Currently, calling `GC_INIT' from a secondary thread is only
+   supported on some systems, notably Linux-based systems (and not on
+   FreeBSD, for instance.)
+
+   Up to GC 7.2alpha5, calling `GC_INIT' from a secondary thread would
    lead to a segfault.  This was fixed in BDW-GC on 2011-04-16 by Ivan
    Maidanski.  See <http://thread.gmane.org/gmane.lisp.guile.bugs/5340>
    for details.  */
 
-#if (GC_VERSION_MAJOR > 7)                                     \
-  || ((GC_VERSION_MAJOR == 7) && (GC_VERSION_MINOR > 2))       \
-  || ((GC_VERSION_MAJOR == 7) && (GC_VERSION_MINOR == 2)       \
-      && (GC_ALPHA_VERSION > 5))
+#if defined __linux__                                          \
+  && (GC_VERSION_MAJOR > 7                                     \
+      || (GC_VERSION_MAJOR == 7 && GC_VERSION_MINOR > 2)       \
+      || (GC_VERSION_MAJOR == 7 && GC_VERSION_MINOR == 2       \
+         && GC_ALPHA_VERSION > 5))
 
 static void *
 do_something (void *arg)
@@ -73,7 +78,7 @@ main (int argc, char *argv[])
 }
 
 
-#else /* GC < 7.2 */
+#else /* Linux && GC < 7.2alpha5 */
 
 int
 main (int argc, char *argv[])
diff --git a/test-suite/tests/ports.test b/test-suite/tests/ports.test
index 3729930..886ab24 100644
--- a/test-suite/tests/ports.test
+++ b/test-suite/tests/ports.test
@@ -2,7 +2,7 @@
 ;;;; Jim Blandy <address@hidden> --- May 1999
 ;;;;
 ;;;;   Copyright (C) 1999, 2001, 2004, 2006, 2007, 2009, 2010,
-;;;;      2011, 2012 Free Software Foundation, Inc.
+;;;;      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
@@ -1162,33 +1162,35 @@
 
 (with-test-prefix "%file-port-name-canonicalization"
 
-  (pass-if "absolute file name & empty %load-path entry"
+  (pass-if-equal "absolute file name & empty %load-path entry" "/dev/null"
     ;; In Guile 2.0.5 and earlier, this would return "dev/null" instead
     ;; of "/dev/null".  See
     ;; <http://lists.gnu.org/archive/html/guile-devel/2012-05/msg00059.html>
     ;; for a discussion.
-    (equal? "/dev/null"
-            (with-load-path (cons "" (delete "/" %load-path))
-              (with-fluids ((%file-port-name-canonicalization 'relative))
-                (port-filename (open-input-file "/dev/null"))))))
-
-  (pass-if "relative canonicalization with /"
-    (equal? "dev/null"
-            (with-load-path (cons "/" %load-path)
-              (with-fluids ((%file-port-name-canonicalization 'relative))
-                (port-filename (open-input-file "/dev/null"))))))
-
-  (pass-if "relative canonicalization from ice-9"
-    (equal? "ice-9/q.scm"
-            (with-fluids ((%file-port-name-canonicalization 'relative))
-              (port-filename
-               (open-input-file (%search-load-path "ice-9/q.scm"))))))
-
-  (pass-if "absolute canonicalization from ice-9"
-    (equal? (string-append (assoc-ref %guile-build-info 'top_srcdir)
-                           "/module/ice-9/q.scm")
-            (with-fluids ((%file-port-name-canonicalization 'absolute))
-              (port-filename (open-input-file (%search-load-path 
"ice-9/q.scm")))))))
+    (with-load-path (cons "" (delete "/" %load-path))
+      (with-fluids ((%file-port-name-canonicalization 'relative))
+        (port-filename (open-input-file "/dev/null")))))
+
+  (pass-if-equal "relative canonicalization with /" "dev/null"
+    (with-load-path (cons "/" %load-path)
+      (with-fluids ((%file-port-name-canonicalization 'relative))
+        (port-filename (open-input-file "/dev/null")))))
+
+  (pass-if-equal "relative canonicalization from ice-9" "ice-9/q.scm"
+    ;; If an entry in %LOAD-PATH is not canonical, then
+    ;; `scm_i_relativize_path' is unable to do its job.
+    (if (equal? (map canonicalize-path %load-path) %load-path)
+        (with-fluids ((%file-port-name-canonicalization 'relative))
+          (port-filename
+           (open-input-file (%search-load-path "ice-9/q.scm"))))
+        (throw 'unresolved)))
+
+  (pass-if-equal "absolute canonicalization from ice-9"
+      (canonicalize-path
+       (string-append (assoc-ref %guile-build-info 'top_srcdir)
+                      "/module/ice-9/q.scm"))
+    (with-fluids ((%file-port-name-canonicalization 'absolute))
+      (port-filename (open-input-file (%search-load-path "ice-9/q.scm"))))))
 
 (delete-file (test-file))
 


hooks/post-receive
-- 
GNU Guile