From a3dbf9924e56ca70d023f9db3b335b0ef4d251f3 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Wed, 19 Aug 2026 13:25:20 -0400
Subject: [PATCH] Prefer not to use #+#. in tests

---
 tests/dump.impure-cload.lisp | 11 +++++------
 tests/loop.pure.lisp         |  5 ++---
 tests/type.pure.lisp         |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/tests/dump.impure-cload.lisp b/tests/dump.impure-cload.lisp
index 493654049..0a297c880 100644
--- a/tests/dump.impure-cload.lisp
+++ b/tests/dump.impure-cload.lisp
@@ -132,12 +132,11 @@
   (assert (eq *base-string-1* *base-string-2*))
   (assert (typep *base-string-1* '(simple-base-string 5))))
 
-#-#.(cl:if (cl:subtypep 'cl:character 'cl:base-char) '(and) '(or))
-(progn
-  (defvar *base-string*
-    #.(make-string 5 :element-type 'base-char :initial-element #\x))
-  (defvar *character-string*
-    #.(make-string 5 :initial-element #\x))
+(defvar *base-string*
+  #.(make-string 5 :element-type 'base-char :initial-element #\x))
+(defvar *character-string*
+  #.(make-string 5 :initial-element #\x))
+(unless (subtypep 'character 'base-char)
   (assert (not (eq *base-string* *character-string*)))
   (assert (typep *base-string* 'base-string))
   (assert (typep *character-string* '(vector character))))
diff --git a/tests/loop.pure.lisp b/tests/loop.pure.lisp
index 178ff9052..389f554c7 100644
--- a/tests/loop.pure.lisp
+++ b/tests/loop.pure.lisp
@@ -38,8 +38,7 @@
 ;;; The type declarations should apply, hence under Python's
 ;;; declarations-are-assertions rule, the code should signal a type
 ;;; error. (Except when running interpreted code)
-#+#.(cl:if (cl:eq sb-ext:*evaluator-mode* :compile) '(and) '(or))
-(with-test (:name :loop-type-decl)
+(with-test (:name :loop-type-decl :skipped-on :interpreter)
   (declare (muffle-conditions style-warning))
   (assert (typep (nth-value 1
                             (ignore-errors
@@ -193,7 +192,7 @@
   (setf (gethash 7 ht) 15)
   (assert (= (loop for v fixnum being each hash-key in ht sum v) 8))
   (assert (= (loop for v fixnum being each hash-value in ht sum v) 18))
-  #+#.(cl:if (cl:eq sb-ext:*evaluator-mode* :compile) '(and) '(or))
+  #-interpreter
   (assert-error (loop for v float being each hash-value in ht sum v)
                 type-error))
 
diff --git a/tests/type.pure.lisp b/tests/type.pure.lisp
index 15da6bbd4..bc2c0ba81 100644
--- a/tests/type.pure.lisp
+++ b/tests/type.pure.lisp
@@ -272,8 +272,8 @@
 ;;;
 ;;; (In fact, this is such a fearsome loop that executing it with the
 ;;; evaluator would take ages... Disable it under those circumstances.)
-#+#.(cl:if (cl:eq sb-ext:*evaluator-mode* :compile) '(and) '(or))
-(with-test (:name (:type-derivation :logical-operations :correctness) :slow t)
+(with-test (:name (:type-derivation :logical-operations :correctness) :slow t
+                  :skipped-on :interpreter)
   (let* ((n-bits 5)
          (size (ash 1 n-bits)))
     (labels ((brute-force (a b c d op)