From a0c457b3d3de08e55323b51c0fc88fc1510be16e Mon Sep 17 00:00:00 2001 From: pfdietz <pfdietz@localhost> Date: Mon, 1 Nov 2004 13:19:09 +0000 Subject: [PATCH] Changed to avoid defpackage so I can test some CLtL1s like WCL --- ansi-tests/cl-test-package.lsp | 16 ++++++++++++++++ ansi-tests/rt-package.lsp | 35 +++++++++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/ansi-tests/cl-test-package.lsp b/ansi-tests/cl-test-package.lsp index 966a4710..43ee22bc 100644 --- a/ansi-tests/cl-test-package.lsp +++ b/ansi-tests/cl-test-package.lsp @@ -3,6 +3,7 @@ ;;;; Created: Sat Mar 14 10:13:21 1998 ;;;; Contains: CL test case package definition +#| (progn (defpackage :cl-test (:use :cl :regression-test) @@ -12,3 +13,18 @@ (:export #:random-from-seq #:random-case #:coin #:random-permute)) (let ((s (find-symbol "QUIT" "CL-USER"))) (when s (import s :cl-test)))) +|# + +(let* ((name :cl-test) + (pkg (find-package name))) + (unless pkg (setq pkg (make-package name :use '(#-wcl :cl #+wcl :lisp :regression-test)))) + (let ((*package* pkg)) + (shadow '(#:handler-case #:handler-bind)) + (import '(#-wcl common-lisp-user::compile-and-load + #+wcl user::compile-and-load) + pkg) + (export (mapcar #'intern (mapcar #'symbol-name '(#:random-from-seq #:random-case #:coin #:random-permute))))) + (let ((s (find-symbol "QUIT" "CL-USER"))) + (when s (import s :cl-test)))) + + diff --git a/ansi-tests/rt-package.lsp b/ansi-tests/rt-package.lsp index b751401a..358a9516 100644 --- a/ansi-tests/rt-package.lsp +++ b/ansi-tests/rt-package.lsp @@ -3,9 +3,9 @@ ;;;; Created: Tue Dec 17 21:10:53 2002 ;;;; Contains: Package definition for RT -(eval-when - (:execute :compile-toplevel :load-toplevel) - (defpackage :regression-test + +;; (eval-when (:execute :compile-toplevel :load-toplevel) +#| (defpackage :regression-test (:use :cl) (:nicknames :rtest #-lispworks :rt) (:export @@ -24,6 +24,31 @@ #:my-aref #:*catch-errors* #:disable-note - ))) + )) + |# + (let* ((name (symbol-name :regression-test)) + (pkg (find-package name))) + (unless pkg (setq pkg (make-package name + :nicknames (mapcar #'symbol-name '(:rtest #-lispworks :rt)) + :use '(#-wcl :cl #+wcl :lisp) + ))) + (let ((*package* pkg)) + (export (mapcar #'intern + (mapcar #'symbol-name + '(#:*compile-tests* + #:*test* + #:continue-testing + #:deftest + #:do-test + #:do-tests + #:get-test + #:pending-tests + #:rem-all-tests + #:rem-test + #:defnote + #:my-aref + #:*catch-errors* + #:disable-note)))))) +;; ) -(in-package :regression-test) +;; (in-package :regression-test) -- GitLab