From 40b05dcb299b38010e3bc8d80cae7f7d0752d899 Mon Sep 17 00:00:00 2001
From: pfdietz <pfdietz@localhost>
Date: Fri, 20 Dec 2002 04:04:58 +0000
Subject: [PATCH] Modified some tests to return more useful information on
 failure.

---
 ansi-tests/function.lsp  | 20 ++++++++++----------
 ansi-tests/functionp.lsp | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/ansi-tests/function.lsp b/ansi-tests/function.lsp
index ed1bbe4a..84066c23 100644
--- a/ansi-tests/function.lsp
+++ b/ansi-tests/function.lsp
@@ -32,10 +32,10 @@
 		     (not (special-operator-p s))
 		     (not (macro-function s))
 		     (symbol-function s))
-	always (or (null f)
-		   (typep f 'function)
-		   ))
-  t)
+	unless (or (null f)
+		   (typep f 'function))
+	collect x)
+  nil)
 
 (deftest function.5
   (typep '(setf car) 'function)
@@ -67,12 +67,12 @@
 ;;; In ANSI CL, symbols and cons can no longer also be of type FUNCTION.
 (deftest function.10
   (loop for x in *universe*
-	never
-	(and (or (numberp x) (characterp x)
-		 (symbolp x) (consp x)
-		 (typep x 'array))
-	     (typep x 'function)))
-  t)
+	when (and (or (numberp x) (characterp x)
+		      (symbolp x) (consp x)
+		      (typep x 'array))
+		  (typep x 'function))
+	collect x)
+  nil)
 
 (deftest function.11
   (flet ((%f () nil)) (typep '%f 'function))
diff --git a/ansi-tests/functionp.lsp b/ansi-tests/functionp.lsp
index 1ba1446e..87b51458 100644
--- a/ansi-tests/functionp.lsp
+++ b/ansi-tests/functionp.lsp
@@ -32,9 +32,10 @@
 		     (not (special-operator-p s))
 		     (not (macro-function s))
 		     (symbol-function s))
-	always (or (null f)
-		   (functionp f)))
-  t)
+	unless (or (null f)
+		   (functionp f))
+	collect x)
+  nil)
 
 (deftest functionp.5
   (functionp '(setf car))
@@ -64,12 +65,12 @@
 ;;; In ANSI CL, symbols and cons can no longer be functions
 (deftest functionp.10
   (loop for x in *universe*
-	never
-	(and (or (numberp x) (characterp x)
-		 (symbolp x) (consp x)
-		 (typep x 'array))
-	     (functionp x)))
-  t)
+	when (and (or (numberp x) (characterp x)
+		      (symbolp x) (consp x)
+		      (typep x 'array))
+		  (functionp x))
+	collect x)
+  nil)
 
 (deftest functionp.11
   (flet ((%f () nil)) (functionp '%f))
-- 
GitLab