[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-19-gb16bf64

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

The branch, stable-2.0 has been updated
       via  b16bf64639d457f9cfe8dc7bf80464cd2b86a622 (commit)
       via  41f2f14bd97f3889075419a11e7a555463bd9a0d (commit)
       via  ee49b1684b94627c364e2362e54a596183906021 (commit)
      from  9f7914d39a5047c8d6b2cff554b8f575dcc32302 (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 b16bf64639d457f9cfe8dc7bf80464cd2b86a622
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 16 21:47:39 2013 +0200

    Fix #ifdefery for `setegid'.
    
    * libguile/posix.c (scm_setegid): Change to #ifdef HAVE_SETEGID.

commit 41f2f14bd97f3889075419a11e7a555463bd9a0d
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 16 20:58:10 2013 +0200

    tests: Don't rely on `scm_call_2' being visible.
    
    * test-suite/tests/coverage.test ("procedure-execution-count")["called
      from C"]: Throw 'unresolved when `scm_call_2' cannot be resolved.
      Reported by Eli Zaretskii <address@hidden>.

commit ee49b1684b94627c364e2362e54a596183906021
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 16 20:56:31 2013 +0200

    Augment `.dir-locals.el'.

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

Summary of changes:
 .dir-locals.el                 |    4 +++-
 libguile/posix.c               |    4 ++--
 test-suite/tests/coverage.test |   31 +++++++++++++++++--------------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index ce2af7a..a24e860 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -8,7 +8,9 @@
      (eval . (put 'pass-if 'scheme-indent-function 1))
      (eval . (put 'pass-if-exception 'scheme-indent-function 2))
      (eval . (put 'pass-if-equal 'scheme-indent-function 2))
-     (eval . (put 'with-test-prefix 'scheme-indent-function 1))))
+     (eval . (put 'with-test-prefix 'scheme-indent-function 1))
+     (eval . (put 'with-code-coverage 'scheme-indent-function 1))
+     (eval . (put 'with-statprof 'scheme-indent-function 1))))
  (emacs-lisp-mode . ((indent-tabs-mode . nil)))
  (texinfo-mode    . ((indent-tabs-mode . nil)
                      (fill-column . 72))))
diff --git a/libguile/posix.c b/libguile/posix.c
index 8651818..3e03c86 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -910,7 +910,7 @@ SCM_DEFINE (scm_seteuid, "seteuid", 1, 0, 0,
 
 
 #ifdef HAVE_SETEGID
-SCM_DEFINE (scm_setegid, "setegid", 1, 0, 0, 
+SCM_DEFINE (scm_setegid, "setegid", 1, 0, 0,
             (SCM id),
            "Sets the effective group ID to the integer @var{id}, provided the 
process\n"
            "has appropriate privileges.  If effective IDs are not supported, 
the\n"
@@ -921,7 +921,7 @@ SCM_DEFINE (scm_setegid, "setegid", 1, 0, 0,
 {
   int rv;
 
-#ifdef HAVE_SETEUID
+#ifdef HAVE_SETEGID
   rv = setegid (scm_to_int (id));
 #else
   rv = setgid (scm_to_int (id));
diff --git a/test-suite/tests/coverage.test b/test-suite/tests/coverage.test
index b29de0f..336c87a 100644
--- a/test-suite/tests/coverage.test
+++ b/test-suite/tests/coverage.test
@@ -1,6 +1,6 @@
 ;;;; coverage.test --- Code coverage.    -*- 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
@@ -230,19 +230,22 @@
     ;; The `scm_call_N' functions use the VM returned by `the-vm'.  This
     ;; test makes sure that they get to use %TEST-VM.
     (let ((proc (code "foo.scm" "(lambda (x y) (+ x y))"))
-          (call (pointer->procedure '*
-                                    (dynamic-func "scm_call_2"
-                                                  (dynamic-link))
-                                    '(* * *))))
-      (let-values (((data result)
-                    (with-code-coverage %test-vm
-                      (lambda ()
-                        (call (make-pointer (object-address proc))
-                              (make-pointer (object-address 1))
-                              (make-pointer (object-address 2)))))))
-        (and (coverage-data? data)
-             (= (object-address 3) (pointer-address result))
-             (= (procedure-execution-count data proc) 1)))))
+          (call (false-if-exception       ; can we resolve `scm_call_2'?
+                 (pointer->procedure '*
+                                     (dynamic-func "scm_call_2"
+                                                   (dynamic-link))
+                                     '(* * *)))))
+      (if call
+          (let-values (((data result)
+                        (with-code-coverage %test-vm
+                          (lambda ()
+                            (call (make-pointer (object-address proc))
+                                  (make-pointer (object-address 1))
+                                  (make-pointer (object-address 2)))))))
+            (and (coverage-data? data)
+                 (= (object-address 3) (pointer-address result))
+                 (= (procedure-execution-count data proc) 1)))
+          (throw 'unresolved))))
 
   (pass-if "called from eval"
     (let-values (((data result)


hooks/post-receive
-- 
GNU Guile