1.0.28.6: move the new PROGV tests to the right part of the file

 * Oops.

diff --git a/tests/compiler.impure.lisp b/tests/compiler.impure.lisp
index ef9d8b0..06f52a5 100644 (file)
--- a/tests/compiler.impure.lisp
+++ b/tests/compiler.impure.lisp
@@ -1069,6 +1069,21 @@
     (let ((usage-after (sb-kernel::dynamic-usage)))
       (when (< (+ usage-before 2000000) usage-after)
         (error "Leak")))))
+
+;;; PROGV compilation and type checking when the declared type
+;;; includes a FUNCTION subtype.
+(declaim (type (or (function (t) (values boolean &optional)) string)
+               *hairy-progv-var*))
+(defvar *hairy-progv-var* #'null)
+(with-test (:name :hairy-progv-type-checking)
+  (assert (eq :error
+              (handler-case
+                  (progv '(*hairy-progv-var*) (list (eval 42))
+                    *hairy-progv-var*)
+                (type-error () :error))))
+  (assert (equal "GOOD!"
+                 (progv '(*hairy-progv-var*) (list (eval "GOOD!"))
+                    *hairy-progv-var*))))
 \f
 ;;;; tests not in the problem domain, but of the consistency of the
 ;;;; compiler machinery itself
@@ -1820,18 +1835,4 @@
 (setf *mystery* :mystery)
 (assert (eq :ok (test-mystery (make-thing :slot :mystery))))
 
-;;; PROGV compilation and type checking when the declared type
-;;; includes a FUNCTION subtype.
-(declaim (type (or (function (t) (values boolean &optional)) string)
-               *hairy-progv-var*))
-(defvar *hairy-progv-var* #'null)
-(with-test (:name :hairy-progv-type-checking)
-  (assert (eq :error
-              (handler-case
-                  (progv '(*hairy-progv-var*) (list (eval 42))
-                    *hairy-progv-var*)
-                (type-error () :error))))
-  (assert (equal "GOOD!"
-                 (progv '(*hairy-progv-var*) (list (eval "GOOD!"))
-                    *hairy-progv-var*))))
 ;;; success

diff --git a/version.lisp-expr b/version.lisp-expr
index fa70adf..1b40901 100644 (file)
--- 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".)
-"1.0.28.5"
+"1.0.28.6"