From e132056a67a1f000bdc1a3e60072cce01d4b1773 Mon Sep 17 00:00:00 2001 From: pfdietz <pfdietz@localhost> Date: Thu, 10 Oct 2002 02:06:31 +0000 Subject: [PATCH] Slight cleanup in some tests involving examining the compute-restarts list for something other than ABORT restarts. --- ansi-tests/packages-09.lsp | 16 ++++++++-------- ansi-tests/packages-16.lsp | 12 +++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ansi-tests/packages-09.lsp b/ansi-tests/packages-09.lsp index dfbfdf2e..96cf5655 100644 --- a/ansi-tests/packages-09.lsp +++ b/ansi-tests/packages-09.lsp @@ -267,8 +267,8 @@ (handler-case (make-package "A") (error (c) - (if (member 'abort (mapcar #'restart-name (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'failure))) success) @@ -277,8 +277,8 @@ (handler-case (make-package "Q") (error (c) - (if (member 'abort (mapcar #'restart-name (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'failure))) success) @@ -288,8 +288,8 @@ (progn (ignore-errors (delete-package "TEST1")) (make-package "TEST1" :nicknames '("A"))) (error (c) - (if (member 'abort (mapcar #'restart-name (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'failure))) success) @@ -299,8 +299,8 @@ (progn (ignore-errors (delete-package "TEST1")) (make-package "TEST1" :nicknames '("Q"))) (error (c) - (if (member 'abort (mapcar #'restart-name (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'failure))) success) diff --git a/ansi-tests/packages-16.lsp b/ansi-tests/packages-16.lsp index b3eee37d..2000fd6f 100644 --- a/ansi-tests/packages-16.lsp +++ b/ansi-tests/packages-16.lsp @@ -471,7 +471,7 @@ program-error) ;; Names given to :export and :intern must be disjoint, -;; otherwise signal a package-error +;; otherwise signal a program-error (deftest defpackage-23 (ignore-errors (ignore-errors (delete-package "H")) @@ -493,9 +493,8 @@ (handler-case (eval '(defpackage "H" (:shadowing-import-from "G" "NOT-THERE"))) (package-error (c) - (if (member 'abort (mapcar #'restart-name - (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'fail)) (error (c) c))) @@ -512,9 +511,8 @@ (handler-case (eval '(defpackage "H" (:import-from "G" "NOT-THERE"))) (package-error (c) - (if (member 'abort (mapcar #'restart-name - (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'fail)) (error (c) c))) -- GitLab