guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.10-5-g0c1f2b


From: Ludovic Courtès
Subject: [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.10-5-g0c1f2b0
Date: Thu, 20 Mar 2014 08:43:10 +0000

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=0c1f2b0e0d3940fc0d4f3a902d9c487db15f14d5

The branch, stable-2.0 has been updated
       via  0c1f2b0e0d3940fc0d4f3a902d9c487db15f14d5 (commit)
       via  f2c3d29fd256ff4b6022d9af98543be7c625422e (commit)
      from  5dcbcfcef8eefd1f9e57d8ba69efe1ca945c95b1 (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 0c1f2b0e0d3940fc0d4f3a902d9c487db15f14d5
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 20 09:43:01 2014 +0100

    tests: Add #undef NDEBUG when using <assert.h>.
    
    * test-suite/standalone/test-loose-ends.c,
      test-suite/standalone/test-num2integral.c,
      test-suite/standalone/test-round.c,
      test-suite/standalone/test-scm-c-bind-keyword-arguments.c,
      test-suite/standalone/test-scm-c-read.c,
      test-suite/standalone/test-scm-values.c,
      test-suite/standalone/test-smob-mark.c,
      test-suite/standalone/test-srfi-4.c: Add #undef NDEBUG.

commit f2c3d29fd256ff4b6022d9af98543be7c625422e
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 20 09:40:42 2014 +0100

    tests: Check 'simple-format' with closed current-output-port.
    
    This is a follow-up to e26ab06.
    
    * libguile/print.c (scm_simple_format): Pass 1 to
      SCM_VALIDATE_OPORT_VALUE, for 'destination'.
    * test-suite/tests/format.test ("simple-format"): Add test.

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

Summary of changes:
 libguile/print.c                                   |    2 +-
 test-suite/standalone/test-loose-ends.c            |    4 +++-
 test-suite/standalone/test-num2integral.c          |    4 +++-
 test-suite/standalone/test-round.c                 |    4 +++-
 .../standalone/test-scm-c-bind-keyword-arguments.c |    4 +++-
 test-suite/standalone/test-scm-c-read.c            |    4 +++-
 test-suite/standalone/test-scm-values.c            |    4 +++-
 test-suite/standalone/test-smob-mark.c             |    4 +++-
 test-suite/standalone/test-srfi-4.c                |    3 +++
 test-suite/tests/format.test                       |   16 ++++++++++++++++
 10 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/libguile/print.c b/libguile/print.c
index 60683b5..7e27f76 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -1468,7 +1468,7 @@ SCM_DEFINE (scm_simple_format, "simple-format", 2, 0, 1,
   if (scm_is_eq (destination, SCM_BOOL_T))
     {
       destination = port = scm_current_output_port ();
-      SCM_VALIDATE_OPORT_VALUE (0, destination);
+      SCM_VALIDATE_OPORT_VALUE (1, destination);
     }
   else if (scm_is_false (destination))
     {
diff --git a/test-suite/standalone/test-loose-ends.c 
b/test-suite/standalone/test-loose-ends.c
index b4ea5b9..40b358b 100644
--- a/test-suite/standalone/test-loose-ends.c
+++ b/test-suite/standalone/test-loose-ends.c
@@ -3,7 +3,7 @@
  * Test items of the Guile C API that aren't covered by any other tests.
  */
 
-/* Copyright (C) 2009, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2009, 2012, 2014 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
@@ -25,6 +25,8 @@
 # include <config.h>
 #endif
 
+#undef NDEBUG
+
 #include <libguile.h>
 
 #include <stdio.h>
diff --git a/test-suite/standalone/test-num2integral.c 
b/test-suite/standalone/test-num2integral.c
index 0246a33..4f5629d 100644
--- a/test-suite/standalone/test-num2integral.c
+++ b/test-suite/standalone/test-num2integral.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 1999, 2000, 2001, 2003, 2004, 2006, 2008, 2010,
- *   2012 Free Software Foundation, Inc.
+ *   2012, 2014 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
@@ -21,6 +21,8 @@
 # include <config.h>
 #endif
 
+#undef NDEBUG
+
 #include <libguile.h>
 
 #include <stdio.h>
diff --git a/test-suite/standalone/test-round.c 
b/test-suite/standalone/test-round.c
index 150c881..2cd6fd5 100644
--- a/test-suite/standalone/test-round.c
+++ b/test-suite/standalone/test-round.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2006, 2008, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2006, 2008, 2009, 2011, 2014 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
@@ -20,6 +20,8 @@
 # include <config.h>
 #endif
 
+#undef NDEBUG
+
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/test-suite/standalone/test-scm-c-bind-keyword-arguments.c 
b/test-suite/standalone/test-scm-c-bind-keyword-arguments.c
index ad0722c..f4cd53d 100644
--- a/test-suite/standalone/test-scm-c-bind-keyword-arguments.c
+++ b/test-suite/standalone/test-scm-c-bind-keyword-arguments.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Free Software Foundation, Inc.
+/* Copyright (C) 2013, 2014 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
@@ -20,6 +20,8 @@
 # include <config.h>
 #endif
 
+#undef NDEBUG
+
 #include <libguile.h>
 
 #include <assert.h>
diff --git a/test-suite/standalone/test-scm-c-read.c 
b/test-suite/standalone/test-scm-c-read.c
index 4111cd0..5f11e75 100644
--- a/test-suite/standalone/test-scm-c-read.c
+++ b/test-suite/standalone/test-scm-c-read.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2008, 2014 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
@@ -23,6 +23,8 @@
 # include <config.h>
 #endif
 
+#undef NDEBUG
+
 #include <libguile.h>
 #include <assert.h>
 
diff --git a/test-suite/standalone/test-scm-values.c 
b/test-suite/standalone/test-scm-values.c
index ece62da..06f57be 100644
--- a/test-suite/standalone/test-scm-values.c
+++ b/test-suite/standalone/test-scm-values.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2012, 2014 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
@@ -20,6 +20,8 @@
 # include <config.h>
 #endif
 
+#undef NDEBUG
+
 #include <assert.h>
 #include <libguile.h>
 #include <stdlib.h>
diff --git a/test-suite/standalone/test-smob-mark.c 
b/test-suite/standalone/test-smob-mark.c
index d9db9a6..86566af 100644
--- a/test-suite/standalone/test-smob-mark.c
+++ b/test-suite/standalone/test-smob-mark.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Free Software Foundation, Inc.
+/* Copyright (C) 2013, 2014 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
@@ -20,6 +20,8 @@
 #include <config.h>
 #endif
 
+#undef NDEBUG
+
 #include <assert.h>
 #include <libguile.h>
 #include <stdio.h>
diff --git a/test-suite/standalone/test-srfi-4.c 
b/test-suite/standalone/test-srfi-4.c
index 22e079c..b49e666 100644
--- a/test-suite/standalone/test-srfi-4.c
+++ b/test-suite/standalone/test-srfi-4.c
@@ -20,6 +20,9 @@
 # include <config.h>
 #endif
 
+/* Make sure the assertions are tested.  */
+#undef NDEBUG
+
 #include <libguile.h>
 
 #include <stdio.h>
diff --git a/test-suite/tests/format.test b/test-suite/tests/format.test
index 3349847..cc31942 100644
--- a/test-suite/tests/format.test
+++ b/test-suite/tests/format.test
@@ -24,6 +24,22 @@
   #:use-module (ice-9 format))
 
 
+(with-test-prefix "simple-format"
+  (pass-if-exception "current-output-port is closed"
+      exception:wrong-type-arg
+    ;; This used to segfault in Guile <= 2.0.10.
+    (let ((old (current-output-port))
+          (new (%make-void-port "w")))
+      (dynamic-wind
+        (lambda ()
+          (set-current-output-port new)
+          (close-port new))
+        (lambda ()
+          (simple-format #t "hello, closed port!")
+          #t)
+        (lambda ()
+          (set-current-output-port old))))))
+
 ;;; FORMAT Basic Output
 
 (with-test-prefix "format basic output"


hooks/post-receive
-- 
GNU Guile



reply via email to

[Prev in Thread] Current Thread [Next in Thread]