X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fcompiler.test.sh;h=f2921ef21be2a00031e44155de4e35faf7874366;hb=31f68584d0732dc0d17f379773e5f87f1e5a78ad;hp=549141d7c4608b09129fb71c50656a69bee55fac;hpb=af4276830f299244920d0e131e1e5e088383b763;p=sbcl.git

diff --git a/tests/compiler.test.sh b/tests/compiler.test.sh
index 549141d..f2921ef 100644
--- a/tests/compiler.test.sh
+++ b/tests/compiler.test.sh
@@ -26,14 +26,13 @@ cat > $tmpfilename <<EOF
 EOF
 expect_failed_compile $tmpfilename
 
-# This should fail (but right now we just get a style-warning), as
-# type inference should show that the call to FOO has a wrong number
-# of args.
+# This should fail, as type inference should show that the call to FOO
+# has a wrong number of args.
 cat > $tmpfilename <<EOF
     (in-package :cl-user)
     (defun foo (x) (or x (foo x x)))
 EOF
-expect_condition_during_compile style-warning $tmpfilename
+expect_failed_compile $tmpfilename
 
 # This should fail, as we define a function multiply in the same file
 # (CLHS 3.2.2.3).
@@ -461,7 +460,7 @@ cat > $tmpfilename <<EOF
 (eval-when (:compile-toplevel)
   (error "ERROR within EVAL-WHEN."))
 EOF
-expect_condition_during_compile sb-c:compiler-error $tmpfilename
+expect_condition_during_compile simple-error $tmpfilename
 
 cat > $tmpfilename <<EOF
 (defun slot-name-incf (s)
@@ -470,5 +469,49 @@ cat > $tmpfilename <<EOF
 EOF
 expect_clean_cload $tmpfilename
 
+cat > $tmpfilename <<EOF
+(in-package :cl-user)
+
+(defun foo ()
+  (declare (muffle-conditions warning))
+  (let ((em 0d0))
+    (declare (type double-float em))
+    (dotimes (i 42)
+      (setf em (float (1+ i))))))
+EOF
+expect_clean_compile $tmpfilename
+
+cat > $tmpfilename <<EOF
+(in-package :cl-user)
+
+(defun foo ()
+  (declare (muffle-conditions warning))
+  (flet ((foo ()
+           (declare (values fixnum))
+           nil))
+    (foo)))
+EOF
+expect_clean_compile $tmpfilename
+
+cat > $tmpfilename <<EOF
+(in-package :cl-user)
+
+(defun foo (x)
+  (declare (muffle-conditions warning)
+           (type (vector (mod 7) 1) x))
+  (setf (aref x 0) 8)
+  x)
+EOF
+expect_clean_compile $tmpfilename
+
+cat > $tmpfilename <<EOF
+(in-package :cl-user)
+
+(declaim (notinline foo))
+(let ((i 0)) (defun foo (x) (incf i x)))
+(defun bar (x) (foo x))
+EOF
+fail_on_condition_during_compile sb-ext:compiler-note $tmpfilename
+
 # success
 exit $EXIT_TEST_WIN