1.0.46.34: Fix tests for builds without sb-eval.

Add #+sb-evel to cases which bind sb-ext:*evaluator-mode* to :interpret.

diff --git a/tests/compiler.impure.lisp b/tests/compiler.impure.lisp
index afabf80..7793ab3 100644 (file)
--- a/tests/compiler.impure.lisp
+++ b/tests/compiler.impure.lisp
@@ -1708,6 +1708,7 @@
                            (list &whole x)))
               (program-error ()
                 :ok))))
+#+sb-eval
 (assert (eq :ok
             (handler-case
                 (let ((*evaluator-mode* :interpret))
@@ -1726,7 +1727,7 @@
                  (defmacro macro-no-env ()
                    :foo))))
 
-(dolist (*evaluator-mode* '(:interpret :compile))
+(dolist (*evaluator-mode* '(#+sb-eval :interpret :compile))
   (disassemble (eval '(defun disassemble-source-form-bug (x y z)
                        (declare (optimize debug))
                        (list x y z)))))

diff --git a/tests/compiler.pure.lisp b/tests/compiler.pure.lisp
index 051be59..c8d09ac 100644 (file)
--- a/tests/compiler.pure.lisp
+++ b/tests/compiler.pure.lisp
@@ -2759,7 +2759,7 @@
                           (eval '(,lambda ,@args))))))))
   (sb-vm::with-float-traps-masked
       (:divide-by-zero :overflow :inexact :invalid)
-    (let ((sb-ext:*evaluator-mode* :interpret))
+    (let (#+sb-eval (sb-ext:*evaluator-mode* :interpret))
       (declare (sb-ext:muffle-conditions style-warning))
       (test-comparison eql t t nil)
       (test-comparison eql t t t)

diff --git a/tests/list.pure.lisp b/tests/list.pure.lisp
index 0340d85..431275b 100644 (file)
--- a/tests/list.pure.lisp
+++ b/tests/list.pure.lisp
@@ -336,6 +336,7 @@
 (assert (equal '((:b)) (funcall
                         (compile nil '(lambda (x y) (adjoin x y :key #'car :test #'string=)))
                         (list 'b) (list '(:b)))))
+#+sb-eval
 (assert (equal '((:b))
                (let ((sb-ext:*evaluator-mode* :interpret))
                  (eval '(adjoin (list 'b) (list '(:b)) :key #'car :test #'string=)))))

diff --git a/tests/macroexpand.impure.lisp b/tests/macroexpand.impure.lisp
index a59a331..3df0bdd 100644 (file)
--- a/tests/macroexpand.impure.lisp
+++ b/tests/macroexpand.impure.lisp
@@ -45,6 +45,7 @@
     (assert flag)
     (assert expanded-p)))
 
+#+sb-eval
 (let ((sb-ext::*evaluator-mode* :interpret))
   (let* ((expanded-p nil)
          (*macroexpand-hook* #'(lambda (fn form env)

diff --git a/version.lisp-expr b/version.lisp-expr
index d69ed47..429f15b 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -20,4 +20,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.46.33"
+"1.0.46.34"