[Guile-commits] 06/19: Merge commit 'fdd319e9bd4121d844662d3d8ccc69b462b60840'

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 086bbcc874f230c709b7c0a46439c2fd3f7cd37c
Merge: d5dffec fdd319e
Author: Andy Wingo <address@hidden>
Date:   Thu Jan 22 13:04:34 2015 +0100

    Merge commit 'fdd319e9bd4121d844662d3d8ccc69b462b60840'

 THANKS                            |    1 +
 libguile/bytevectors.c            |    2 +-
 libguile/error.c                  |    9 ++++++---
 libguile/load.c                   |   29 +++++++++++++----------------
 libguile/validate.h               |    7 +++++++
 meta/guile.m4                     |    2 +-
 test-suite/tests/bytevectors.test |   15 ++++++++++++---
 7 files changed, 41 insertions(+), 24 deletions(-)

diff --cc test-suite/tests/bytevectors.test
index c4ae1bb,8abda4a..91367db
--- a/test-suite/tests/bytevectors.test
+++ b/test-suite/tests/bytevectors.test
@@@ -682,16 -687,17 +682,25 @@@
  
    (pass-if "bitvector > 8"
      (let ((bv (uniform-array->bytevector (make-bitvector 9 #t))))
 -      (= (bytevector-length bv) 2))))
 +      (= (bytevector-length bv) 4)))
 +
 +  (pass-if "bitvector == 32"
 +    (let ((bv (uniform-array->bytevector (make-bitvector 32 #t))))
 +      (= (bytevector-length bv) 4)))
 +
 +  (pass-if "bitvector > 32"
 +    (let ((bv (uniform-array->bytevector (make-bitvector 33 #t))))
 +      (= (bytevector-length bv) 8))))
  
+ 
+ (with-test-prefix "srfi-4 homogeneous numeric vectors as bytevectors"
+ 
+   ;; This failed prior to Guile 2.0.12.
+   ;; See <http://bugs.gnu.org/18866>.
+   (pass-if-equal "bytevector-copy on srfi-4 arrays"
+       (make-bytevector 8 #xFF)
+     (bytevector-copy (make-u32vector 2 #xFFFFFFFF))))
+ 
  ;;; Local Variables:
  ;;; eval: (put 'with-test-prefix/c&e 'scheme-indent-function 1)
  ;;; End: