From: Brian Mastenbrook <bmastenb@cs.indiana.edu>
Date: Sun, 28 Aug 2005 02:26:45 +0000 (+0000)
Subject: 0.9.4.12:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=6ddaf294e5a7e3b1792ed1d9c342894c38538773;p=sbcl.git

0.9.4.12:
	Test fixes:
	 * make sure we don't use :darwin when we mean (:and :ppc :darwin)
	 * enable a test which passes on Darwin but was previously
	   commented out (possibly due to insufficient memory space?)
	 * use with-test to turn a floating-point traps test into an
	   expected failure on PPC Darwin, where floating-point traps are not
	   enabled.
---

diff --git a/tests/bit-vector.impure-cload.lisp b/tests/bit-vector.impure-cload.lisp
index 470bf57..7809cc1 100644
--- a/tests/bit-vector.impure-cload.lisp
+++ b/tests/bit-vector.impure-cload.lisp
@@ -69,14 +69,12 @@
     (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)
 
diff --git a/tests/callback.impure.lisp b/tests/callback.impure.lisp
index 747ccf2..8dd89d7 100644
--- a/tests/callback.impure.lisp
+++ b/tests/callback.impure.lisp
@@ -14,7 +14,7 @@
 (in-package :cl-user)
 
 ;;; callbacks only on a few platforms
-#-(or darwin x86)
+#-(or (and ppc darwin) x86)
 (quit :unix-status 104)
 
 ;;; simple callback for a function
diff --git a/tests/debug.impure.lisp b/tests/debug.impure.lisp
index 6ff1481..a3f3fbb 100644
--- a/tests/debug.impure.lisp
+++ b/tests/debug.impure.lisp
@@ -337,14 +337,14 @@
   (assert (search "TRACE-THIS" out))
   (assert (search "returned OK" out)))
 
-(with-test (:fails-on '(and :ppc :darwin))
-  ;;; bug 379
-  (let ((out (with-output-to-string (*trace-output*)
-               (trace trace-this :encapsulate nil)
-               (assert (eq 'ok (trace-this)))
-               (untrace))))
-    (assert (search "TRACE-THIS" out))
-    (assert (search "returned OK" out))))
+;;; bug 379
+#-(and ppc darwin)
+(let ((out (with-output-to-string (*trace-output*)
+             (trace trace-this :encapsulate nil)
+             (assert (eq 'ok (trace-this)))
+             (untrace))))
+  (assert (search "TRACE-THIS" out))
+  (assert (search "returned OK" out)))
 
 ;;;; test infinite error protection
 
diff --git a/tests/float.pure.lisp b/tests/float.pure.lisp
index cebcc4e..0e2d57b 100644
--- a/tests/float.pure.lisp
+++ b/tests/float.pure.lisp
@@ -92,7 +92,7 @@
 (assert (= 0.0 (scale-float 1.0 most-negative-fixnum)))
 (assert (= 0.0d0 (scale-float 1.0d0 (1- most-negative-fixnum))))
 
-(with-test (:fails-on '(or :darwin)) ;; bug 372
+(with-test (:fails-on '(or :ppc)) ;; bug 372
   (progn
     (assert (raises-error? (scale-float 1.0 most-positive-fixnum)
                            floating-point-overflow))
@@ -117,10 +117,11 @@
    #c(1.0d0 2.0d0))
     'double-float))
 
-(assert (typep (nth-value
-                1
-                (ignore-errors
-                  (sb-sys:without-interrupts
-                    (loop repeat 2 summing most-positive-double-float)
-                    (sleep 2))))
-               'floating-point-overflow))
+(with-test (:fails-on '(or :ppc))
+  (assert (typep (nth-value
+                  1
+                  (ignore-errors
+                    (sb-sys:without-interrupts
+                     (loop repeat 2 summing most-positive-double-float)
+                     (sleep 2))))
+                 'floating-point-overflow)))
\ No newline at end of file
diff --git a/version.lisp-expr b/version.lisp-expr
index 06af1b2..5094781 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.4.11"
+"0.9.4.12"