X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fbit-vector.impure-cload.lisp;h=2b22e329c53651634114b5418ffbcc757b240fec;hb=1600081cf1b71b3d0e2e40de1c1c124a3a4fd40c;hp=ac2b7b398a075f6a0d2b035fb11a8fa13d32d1c9;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git

diff --git a/tests/bit-vector.impure-cload.lisp b/tests/bit-vector.impure-cload.lisp
index ac2b7b3..2b22e32 100644
--- a/tests/bit-vector.impure-cload.lisp
+++ b/tests/bit-vector.impure-cload.lisp
@@ -69,21 +69,26 @@
     (assert (= (aref a 0) 1))
     (inform :aref-2)
     (assert (= (aref a (- array-dimension-limit 2)) 1))
-    #-darwin
-    (progn
-      (inform :bit-and)
-      (bit-and a b a)
-      (inform :aref-3)
-      (assert (= (aref a 0) 0))
-      (inform :aref-4)
-      (assert (= (aref a (- array-dimension-limit 2)) 0)))))
+    (inform :bit-and)
+    (bit-and a b a)
+    (inform :aref-3)
+    (assert (= (aref a 0) 0))
+    (inform :aref-4)
+    (assert (= (aref a (- array-dimension-limit 2)) 0))))
 
 (test-small-bit-vectors)
 
-#-x86-64
-;; except on machines where addressable space is likely to be
-;; much bigger than physical memory
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defun dynamic-space-size ()
+    #+gencgc
+    (- sb-vm:dynamic-space-end sb-vm:dynamic-space-start)
+    #-gencgc
+    (- sb-vm:dynamic-space-0-end sb-vm:dynamic-space-0-start)))
+
+;; except on machines where the arrays won't fit into the dynamic space.
+#+#.(cl:if (cl:> (cl-user::dynamic-space-size)
+                 (cl:truncate (cl:1- cl:array-dimension-limit)
+                              sb-vm:n-word-bits))
+           '(and)
+           '(or))
 (test-big-bit-vectors)
-
-;;; success
-(sb-ext:quit :unix-status 104)