X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Farray.pure.lisp;h=aea6827796b875189d1fc8c33cda93493b5b4265;hb=5edd74f6911093805a009a152b32216b3dba59f7;hp=d25d97c490441629eec0063266f7fa0b6e44a1e1;hpb=416152f084604094445a758ff399871132dff2bd;p=sbcl.git

diff --git a/tests/array.pure.lisp b/tests/array.pure.lisp
index d25d97c..aea6827 100644
--- a/tests/array.pure.lisp
+++ b/tests/array.pure.lisp
@@ -11,21 +11,20 @@
 
 (in-package :cl-user)
 
-;;; FIXME: Bug 126 isn't dead yet..
-#|
 ;;; Array initialization has complicated defaulting for :ELEMENT-TYPE,
 ;;; and both compile-time and run-time logic takes a whack at it.
 (let ((testcases '(;; Bug 126, confusion between high-level default string
 		   ;; initial element #\SPACE and low-level default array
 		   ;; element #\NULL, is gone.
-		   (#\space (make-array 11 :element-type 'character))
+		   (#\null (make-array 11 :element-type 'character))
 		   (#\space (make-string 11 :initial-element #\space))
-		   (#\space (make-string 11))
+		   (#\* (make-string 11 :initial-element #\*))
+		   (#\null (make-string 11))
 		   (#\null (make-string 11 :initial-element #\null))
 		   (#\x (make-string 11 :initial-element #\x))
 		   ;; And the other tweaks made when fixing bug 126 didn't
 		   ;; mess things up too badly either.
-		   (nil (make-array 11))
+		   (0 (make-array 11))
 		   (nil (make-array 11 :initial-element nil))
 		   (12 (make-array 11 :initial-element 12))
 		   (0 (make-array 11 :element-type '(unsigned-byte 4)))
@@ -36,6 +35,6 @@
     (destructuring-bind (expected-result form) testcase
       (unless (eql expected-result (aref (eval form) 3))
         (error "expected ~S in EVAL ~S" expected-result form))
-      (unless (eql expected-result (aref (funcall (compile nil form)) 3))
+      (unless (eql expected-result
+		   (aref (funcall (compile nil `(lambda () ,form))) 3))
         (error "expected ~S in FUNCALL COMPILE ~S" expected-result form)))))
-|#
\ No newline at end of file