[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-16-g9f7914d

[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=9f7914d39a5047c8d6b2cff554b8f575dcc32302

The branch, stable-2.0 has been updated
       via  9f7914d39a5047c8d6b2cff554b8f575dcc32302 (commit)
       via  09fb52b6c908606a0f4a5d5d118128c02de606c4 (commit)
       via  556d35af88f01ba8cb6019de3a54e30e3f7f59d8 (commit)
       via  b518c6a0b3b429615d889aebe73862f76bbbf59c (commit)
       via  dba6f4e2e377a036df666cf101129f80ab3e6864 (commit)
      from  2a1d8403c07704a40279e58373e6605e0c1f6dd7 (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 9f7914d39a5047c8d6b2cff554b8f575dcc32302
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 16 16:54:12 2013 +0200

    tests: Remove symlink only when it exists.
    
    * test-suite/tests/filesys.test: Delete (test-symlink) only if it
      exists---i.e., not on Windows.
      Reported by Eli Zaretskii <address@hidden>.

commit 09fb52b6c908606a0f4a5d5d118128c02de606c4
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 16 16:52:38 2013 +0200

    tests: Skip FFI tests that use `qsort' when it's not accessible.
    
    * test-suite/tests/foreign.test ("procedure->pointer")[qsort]: Wrap in
      `false-if-exception'.
      ["qsort", "qsort, wrong return type", "qsort, wrong arity"]: Throw
      'unresolved when QSORT if #f.
      Reported by Eli Zaretskii <address@hidden>.

commit 556d35af88f01ba8cb6019de3a54e30e3f7f59d8
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 16 16:42:01 2013 +0200

    tests: Don't rely on $TMPDIR and /tmp on Windows.
    
    * test-suite/standalone/test-unwind.c (check_ports)[__MINGW32__]: Use
      $TEMP, $TMP, or / as the value for TMPDIR.
      Patch by Eli Zaretskii <address@hidden>.

commit b518c6a0b3b429615d889aebe73862f76bbbf59c
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 16 16:39:14 2013 +0200

    tests: Use double quotes around shell arguments, for Windows.
    
    * test-suite/standalone/test-system-cmds (test-system-cmd): Use double
      quotes around shell arguments.
      Reported by Eli Zaretskii <address@hidden>.

commit dba6f4e2e377a036df666cf101129f80ab3e6864
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 16 16:19:21 2013 +0200

    Define `AF_UNIX' only when Unix-domain sockets are supported.
    
    * libguile/socket.c (scm_init_socket): Defined `AF_UNIX' only when
      `HAVE_UNIX_DOMAIN_SOCKETS' is defined.
      Reported by Eli Zaretskii <address@hidden>.

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

Summary of changes:
 libguile/socket.c                      |    2 +-
 test-suite/standalone/test-system-cmds |    8 +++++---
 test-suite/standalone/test-unwind.c    |   13 ++++++++++++-
 test-suite/tests/filesys.test          |    3 ++-
 test-suite/tests/foreign.test          |   16 ++++++++++------
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/libguile/socket.c b/libguile/socket.c
index fd5bea8..ee84fa3 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -1736,7 +1736,7 @@ scm_init_socket ()
 #ifdef AF_UNSPEC
   scm_c_define ("AF_UNSPEC", scm_from_int (AF_UNSPEC));
 #endif
-#ifdef AF_UNIX
+#if defined HAVE_UNIX_DOMAIN_SOCKETS && defined AF_UNIX
   scm_c_define ("AF_UNIX", scm_from_int (AF_UNIX));
 #endif
 #ifdef AF_INET
diff --git a/test-suite/standalone/test-system-cmds 
b/test-suite/standalone/test-system-cmds
index f500729..8c59083 100755
--- a/test-suite/standalone/test-system-cmds
+++ b/test-suite/standalone/test-system-cmds
@@ -9,8 +9,10 @@ exec guile -q -s "$0" "$@"
          #t
          "test-system-cmds: (system) did not return a boolean\n")
         (exit 1)))
-  
-  (let ((rs (status:exit-val (system "guile -c '(exit 42)'"))))
+
+  ;; Note: Use double quotes since simple quotes are not supported by
+  ;; `cmd.exe' on Windows.
+  (let ((rs (status:exit-val (system "guile -c \"(exit 42)\""))))
     (if (not (= 42 rs))
         (begin
           (simple-format
@@ -39,4 +41,4 @@ exec guile -q -s "$0" "$@"
 
 ;; Local Variables:
 ;; mode: scheme
-;; End:
\ No newline at end of file
+;; End:
diff --git a/test-suite/standalone/test-unwind.c 
b/test-suite/standalone/test-unwind.c
index cf56a96..3aa3e15 100644
--- a/test-suite/standalone/test-unwind.c
+++ b/test-suite/standalone/test-unwind.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2008, 2009, 2010, 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
@@ -200,9 +200,20 @@ check_ports ()
 #define FILENAME_TEMPLATE "/check-ports.XXXXXX"
   char *filename;
   const char *tmpdir = getenv ("TMPDIR");
+#ifdef __MINGW32__
+  extern int mkstemp (char *);
 
+  /* On Windows neither $TMPDIR nor /tmp can be relied on.  */
+  if (tmpdir == NULL)
+    tmpdir = getenv ("TEMP");
+  if (tmpdir == NULL)
+    tmpdir = getenv ("TMP");
+  if (tmpdir == NULL)
+    tmpdir = "/";
+#else
   if (tmpdir == NULL)
     tmpdir = "/tmp";
+#endif
 
   filename = alloca (strlen (tmpdir) + sizeof (FILENAME_TEMPLATE) + 1);
   strcpy (filename, tmpdir);
diff --git a/test-suite/tests/filesys.test b/test-suite/tests/filesys.test
index 049c9a2..253c32a 100644
--- a/test-suite/tests/filesys.test
+++ b/test-suite/tests/filesys.test
@@ -222,4 +222,5 @@
           (throw 'unresolved)))))
 
 (delete-file (test-file))
-(delete-file (test-symlink))
+(when (file-exists? (test-symlink))
+  (delete-file (test-symlink)))
diff --git a/test-suite/tests/foreign.test b/test-suite/tests/foreign.test
index 66fd3d5..4b129db 100644
--- a/test-suite/tests/foreign.test
+++ b/test-suite/tests/foreign.test
@@ -224,9 +224,13 @@
 
   (define qsort
     ;; Bindings for libc's `qsort' function.
-    (pointer->procedure void
-                        (dynamic-func "qsort" (dynamic-link))
-                        (list '* size_t size_t '*)))
+    ;; On some platforms, such as MinGW, `qsort' is visible only if
+    ;; linking with `-export-dynamic'.  Just skip these tests when it's
+    ;; not visible.
+    (false-if-exception
+     (pointer->procedure void
+                         (dynamic-func "qsort" (dynamic-link))
+                         (list '* size_t size_t '*))))
 
   (define (dereference-pointer-to-byte ptr)
     (let ((b (pointer->bytevector ptr 1)))
@@ -236,7 +240,7 @@
     '(7 1 127 3 5 4 77 2 9 0))
 
   (pass-if "qsort"
-    (if (defined? 'procedure->pointer)
+    (if (and qsort (defined? 'procedure->pointer))
         (let* ((called? #f)
                (cmp     (lambda (x y)
                           (set! called? #t)
@@ -254,7 +258,7 @@
   (pass-if-exception "qsort, wrong return type"
     exception:wrong-type-arg
 
-    (if (defined? 'procedure->pointer)
+    (if (and qsort (defined? 'procedure->pointer))
         (let* ((cmp     (lambda (x y) #f)) ; wrong return type
                (ptr     (procedure->pointer int cmp (list '* '*)))
                (bv      (u8-list->bytevector input)))
@@ -266,7 +270,7 @@
   (pass-if-exception "qsort, wrong arity"
     exception:wrong-num-args
 
-    (if (defined? 'procedure->pointer)
+    (if (and qsort (defined? 'procedure->pointer))
         (let* ((cmp     (lambda (x y z) #f)) ; wrong arity
                (ptr     (procedure->pointer int cmp (list '* '*)))
                (bv      (u8-list->bytevector input)))


hooks/post-receive
-- 
GNU Guile