From ce325a3d29137589ea098cfda54e2b8f5707bf04 Mon Sep 17 00:00:00 2001 From: pfdietz <pfdietz@localhost> Date: Sun, 23 Feb 2003 17:11:14 +0000 Subject: [PATCH] Modified to run under Lispworks, which unfortunately already had a package (nick)named RT. Changed the regression test package to be REGRESSION-TEST, and make the RT nickname be available only with #-lispworks. Removed a bunch of gratuitous use-package forms. Added lispworks binary filenames to .cvsignore and make clean. Added a test to MAKE-SYMBOL that illustrates a place where Lispworks is noncomplant (this is related to the failure on MAKE-SYMBOL.ERROR.8) --- ansi-tests/ansi-aux.lsp | 3 +-- ansi-tests/cl-symbols.lsp | 35 ++++++++++++++++++---------------- ansi-tests/cl-test-package.lsp | 2 +- ansi-tests/cons-test-01.lsp | 1 - ansi-tests/cons-test-02.lsp | 1 - ansi-tests/cons-test-03.lsp | 2 +- ansi-tests/cons-test-04.lsp | 1 - ansi-tests/cons-test-05.lsp | 1 - ansi-tests/cons-test-06.lsp | 1 - ansi-tests/cons-test-07.lsp | 1 - ansi-tests/cons-test-08.lsp | 1 - ansi-tests/cons-test-09.lsp | 2 +- ansi-tests/cons-test-10.lsp | 2 +- ansi-tests/cons-test-11.lsp | 2 +- ansi-tests/cons-test-12.lsp | 2 +- ansi-tests/cons-test-13.lsp | 2 +- ansi-tests/cons-test-14.lsp | 2 +- ansi-tests/cons-test-15.lsp | 2 +- ansi-tests/cons-test-16.lsp | 2 +- ansi-tests/cons-test-17.lsp | 2 +- ansi-tests/cons-test-18.lsp | 2 +- ansi-tests/cons-test-19.lsp | 2 +- ansi-tests/cons-test-20.lsp | 2 +- ansi-tests/cons-test-21.lsp | 2 +- ansi-tests/cons-test-22.lsp | 2 +- ansi-tests/cons-test-23.lsp | 2 +- ansi-tests/cons-test-24.lsp | 2 +- ansi-tests/cons-test-25.lsp | 2 +- ansi-tests/gclload.lsp | 2 +- ansi-tests/makefile | 2 +- ansi-tests/reader-test.lsp | 25 ++++++++++++------------ ansi-tests/rt-package.lsp | 5 +++-- ansi-tests/rt-test.lsp | 10 +++++----- ansi-tests/rt.lsp | 2 +- ansi-tests/types-and-class.lsp | 1 - 35 files changed, 62 insertions(+), 68 deletions(-) diff --git a/ansi-tests/ansi-aux.lsp b/ansi-tests/ansi-aux.lsp index 173240ab..38292821 100644 --- a/ansi-tests/ansi-aux.lsp +++ b/ansi-tests/ansi-aux.lsp @@ -4,7 +4,6 @@ ;;;; Contains: Aux. functions for CL-TEST (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) @@ -287,7 +286,7 @@ the condition to go uncaught if it cannot be classified." (muffle-warning)))) (proclaim '(optimize (safety 3))) (classify-error* - (if rt::*compile-tests* + (if regression-test::*compile-tests* (funcall (compile nil `(lambda () (declare (optimize (safety 3))) ,form))) diff --git a/ansi-tests/cl-symbols.lsp b/ansi-tests/cl-symbols.lsp index 18eb01dc..f8b5fb4e 100644 --- a/ansi-tests/cl-symbols.lsp +++ b/ansi-tests/cl-symbols.lsp @@ -5,7 +5,6 @@ ;;;; and symbol-related functions (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) @@ -1103,27 +1102,27 @@ ;;; symbol-name (deftest symbol-name.1 - (safe-symbol-name '|ABCD|) + (symbol-name '|ABCD|) "ABCD") (deftest symbol-name.2 - (safe-symbol-name '|1234abcdABCD|) + (symbol-name '|1234abcdABCD|) "1234abcdABCD") (deftest symbol-name.3 - (safe-symbol-name 1) + (classify-error (symbol-name 1)) type-error) (deftest symbol-name.4 - (safe-symbol-name '(a)) + (classify-error (symbol-name '(a))) type-error) (deftest symbol-name.5 - (safe-symbol-name "ABCDE") + (classify-error (symbol-name "ABCDE")) type-error) (deftest symbol-name.6 - (safe-symbol-name 12913.0213) + (classify-error (symbol-name 12913.0213)) type-error) (deftest symbol-name.7 @@ -1179,7 +1178,7 @@ nil) (deftest make-symbol.10 - (symbol-name (safe-make-symbol "")) + (symbol-name (make-symbol "")) "") (deftest make-symbol.order.1 @@ -1190,35 +1189,35 @@ "ABC" 1) (deftest make-symbol.error.1 - (safe-make-symbol nil) + (classify-error (make-symbol nil)) type-error) (deftest make-symbol.error.2 - (safe-make-symbol 'a) + (classify-error (make-symbol 'a)) type-error) (deftest make-symbol.error.3 - (safe-make-symbol 1) + (classify-error (make-symbol 1)) type-error) (deftest make-symbol.error.4 - (safe-make-symbol -1) + (classify-error (make-symbol -1)) type-error) (deftest make-symbol.error.5 - (safe-make-symbol 1.213) + (classify-error (make-symbol 1.213)) type-error) (deftest make-symbol.error.6 - (safe-make-symbol -1312.2) + (classify-error (make-symbol -1312.2)) type-error) (deftest make-symbol.error.7 - (safe-make-symbol #\w) + (classify-error (make-symbol #\w)) type-error) (deftest make-symbol.error.8 - (safe-make-symbol '(a)) + (classify-error (make-symbol '(a))) type-error) (deftest make-symbol.error.9 @@ -1229,6 +1228,10 @@ (classify-error (make-symbol "a" "a")) program-error) +(deftest make-symbol.error.11 + (classify-error (make-symbol '(#\a #\b #\c))) + type-error) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; copy-symbol diff --git a/ansi-tests/cl-test-package.lsp b/ansi-tests/cl-test-package.lsp index 54aa2eb8..550cacef 100644 --- a/ansi-tests/cl-test-package.lsp +++ b/ansi-tests/cl-test-package.lsp @@ -4,7 +4,7 @@ ;;;; Contains: CL test case package definition (defpackage :cl-test - (:use :cl :rt) + (:use :cl :regression-test) #+gcl (:use defpackage) (:nicknames) (:import-from "COMMON-LISP-USER" "COMPILE-AND-LOAD" "==>") diff --git a/ansi-tests/cons-test-01.lsp b/ansi-tests/cons-test-01.lsp index e15fdaf2..c665a817 100644 --- a/ansi-tests/cons-test-01.lsp +++ b/ansi-tests/cons-test-01.lsp @@ -4,7 +4,6 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 1 (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) diff --git a/ansi-tests/cons-test-02.lsp b/ansi-tests/cons-test-02.lsp index cdcecef2..1ce11038 100644 --- a/ansi-tests/cons-test-02.lsp +++ b/ansi-tests/cons-test-02.lsp @@ -4,7 +4,6 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 2 (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) diff --git a/ansi-tests/cons-test-03.lsp b/ansi-tests/cons-test-03.lsp index 7d9a73fc..43ddb610 100644 --- a/ansi-tests/cons-test-03.lsp +++ b/ansi-tests/cons-test-03.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 3 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-04.lsp b/ansi-tests/cons-test-04.lsp index c605428c..0053f0dd 100644 --- a/ansi-tests/cons-test-04.lsp +++ b/ansi-tests/cons-test-04.lsp @@ -4,7 +4,6 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 4 (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) diff --git a/ansi-tests/cons-test-05.lsp b/ansi-tests/cons-test-05.lsp index 1f6b79ee..100c1edd 100644 --- a/ansi-tests/cons-test-05.lsp +++ b/ansi-tests/cons-test-05.lsp @@ -4,7 +4,6 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 5 (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) diff --git a/ansi-tests/cons-test-06.lsp b/ansi-tests/cons-test-06.lsp index 0ea94d48..211003fb 100644 --- a/ansi-tests/cons-test-06.lsp +++ b/ansi-tests/cons-test-06.lsp @@ -4,7 +4,6 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 6 (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) diff --git a/ansi-tests/cons-test-07.lsp b/ansi-tests/cons-test-07.lsp index ec599146..445d0e85 100644 --- a/ansi-tests/cons-test-07.lsp +++ b/ansi-tests/cons-test-07.lsp @@ -4,7 +4,6 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 7 (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) diff --git a/ansi-tests/cons-test-08.lsp b/ansi-tests/cons-test-08.lsp index 916a1287..6b1e3f00 100644 --- a/ansi-tests/cons-test-08.lsp +++ b/ansi-tests/cons-test-08.lsp @@ -4,7 +4,6 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 8 (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) diff --git a/ansi-tests/cons-test-09.lsp b/ansi-tests/cons-test-09.lsp index d4d0061b..baba3477 100644 --- a/ansi-tests/cons-test-09.lsp +++ b/ansi-tests/cons-test-09.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 9 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-10.lsp b/ansi-tests/cons-test-10.lsp index 8779df54..fc625783 100644 --- a/ansi-tests/cons-test-10.lsp +++ b/ansi-tests/cons-test-10.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 10 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-11.lsp b/ansi-tests/cons-test-11.lsp index 40cd2559..c807859b 100644 --- a/ansi-tests/cons-test-11.lsp +++ b/ansi-tests/cons-test-11.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 11 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-12.lsp b/ansi-tests/cons-test-12.lsp index 2c545df7..2402b86a 100644 --- a/ansi-tests/cons-test-12.lsp +++ b/ansi-tests/cons-test-12.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 12 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-13.lsp b/ansi-tests/cons-test-13.lsp index b1f699e2..bdef6cc7 100644 --- a/ansi-tests/cons-test-13.lsp +++ b/ansi-tests/cons-test-13.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 13 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-14.lsp b/ansi-tests/cons-test-14.lsp index aaac91fa..3b90821f 100644 --- a/ansi-tests/cons-test-14.lsp +++ b/ansi-tests/cons-test-14.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 14 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-15.lsp b/ansi-tests/cons-test-15.lsp index f29f020c..89b2a8f6 100644 --- a/ansi-tests/cons-test-15.lsp +++ b/ansi-tests/cons-test-15.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 15 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-16.lsp b/ansi-tests/cons-test-16.lsp index e51f8c6c..8d0e2d59 100644 --- a/ansi-tests/cons-test-16.lsp +++ b/ansi-tests/cons-test-16.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 16 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-17.lsp b/ansi-tests/cons-test-17.lsp index 8d34468a..506bc0e4 100644 --- a/ansi-tests/cons-test-17.lsp +++ b/ansi-tests/cons-test-17.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 17 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) (defun rev-assoc-list (x) diff --git a/ansi-tests/cons-test-18.lsp b/ansi-tests/cons-test-18.lsp index 41180137..679ca9d3 100644 --- a/ansi-tests/cons-test-18.lsp +++ b/ansi-tests/cons-test-18.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 18 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-19.lsp b/ansi-tests/cons-test-19.lsp index c0d0e4bb..1214a725 100644 --- a/ansi-tests/cons-test-19.lsp +++ b/ansi-tests/cons-test-19.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 19 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-20.lsp b/ansi-tests/cons-test-20.lsp index e62d3fe2..6fc53beb 100644 --- a/ansi-tests/cons-test-20.lsp +++ b/ansi-tests/cons-test-20.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 20 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-21.lsp b/ansi-tests/cons-test-21.lsp index 7a6a3ae0..9457df03 100644 --- a/ansi-tests/cons-test-21.lsp +++ b/ansi-tests/cons-test-21.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 21 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-22.lsp b/ansi-tests/cons-test-22.lsp index 3c7a3a40..380d1d47 100644 --- a/ansi-tests/cons-test-22.lsp +++ b/ansi-tests/cons-test-22.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 22 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-23.lsp b/ansi-tests/cons-test-23.lsp index 039dbcd0..53cb2241 100644 --- a/ansi-tests/cons-test-23.lsp +++ b/ansi-tests/cons-test-23.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 23 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-24.lsp b/ansi-tests/cons-test-24.lsp index 0cde9492..04b07cd7 100644 --- a/ansi-tests/cons-test-24.lsp +++ b/ansi-tests/cons-test-24.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 24 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/cons-test-25.lsp b/ansi-tests/cons-test-25.lsp index 6d09f50c..baa1544d 100644 --- a/ansi-tests/cons-test-25.lsp +++ b/ansi-tests/cons-test-25.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Testing of CL Features related to "CONS", part 25 (in-package :cl-test) -(use-package :rt) + (declaim (optimize (safety 3))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ansi-tests/gclload.lsp b/ansi-tests/gclload.lsp index c06b7efe..8d8110c4 100644 --- a/ansi-tests/gclload.lsp +++ b/ansi-tests/gclload.lsp @@ -1,4 +1,4 @@ (load "gclload1.lsp") (load "gclload2.lsp") (in-package :cl-test) -(rt:do-tests) +(regression-test:do-tests) diff --git a/ansi-tests/makefile b/ansi-tests/makefile index 2b72aac9..6078e30f 100644 --- a/ansi-tests/makefile +++ b/ansi-tests/makefile @@ -6,4 +6,4 @@ test-unixport: echo "(load \"gclload.lsp\")" | ../unixport/saved_ansi_gcl | tee test.out clean: - rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl + rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl diff --git a/ansi-tests/reader-test.lsp b/ansi-tests/reader-test.lsp index fb019206..6ec37c2b 100644 --- a/ansi-tests/reader-test.lsp +++ b/ansi-tests/reader-test.lsp @@ -4,12 +4,11 @@ ;;;; Contains: Tests on readtables (just started, very incomplete) (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) (deftest readtable-valid (not (readtablep *readtable*)) nil) -(deftest readtablep-1 +(deftest readtablep.1 (and (not (readtablep nil)) (not (readtablep 'a)) (not (readtablep 0)) @@ -36,17 +35,17 @@ ) t) -(deftest read-symbol-1 +(deftest read-symbol.1 (let ((*package* (find-package "CL-TEST"))) (ignore-errors (read-from-string "a"))) a 1) -(deftest read-symbol-2 +(deftest read-symbol.2 (let ((*package* (find-package "CL-TEST"))) (ignore-errors (read-from-string "|a|"))) |a| 3) -(deftest read-symbol-3 +(deftest read-symbol.3 (multiple-value-bind (s n) (ignore-errors (read-from-string "#:abc")) (not @@ -56,7 +55,7 @@ (string-equal (symbol-name s) "abc")))) nil) -(deftest read-symbol-4 +(deftest read-symbol.4 (multiple-value-bind (s n) (ignore-errors (read-from-string "#:|abc|")) (not @@ -66,7 +65,7 @@ (string= (symbol-name s) "abc")))) nil) -(deftest read-symbol-5 +(deftest read-symbol.5 (multiple-value-bind (s n) (ignore-errors (read-from-string "#:||")) (if (not (symbolp s)) @@ -77,7 +76,7 @@ (string= (symbol-name s) "")))))) t) -(deftest read-symbol-6 +(deftest read-symbol.6 (let ((str "cl-test::abcd0123")) (multiple-value-bind (s n) (ignore-errors (read-from-string str)) @@ -90,7 +89,7 @@ "abcd0123"))))))) t) -(deftest read-symbol-7 +(deftest read-symbol.7 (multiple-value-bind (s n) (ignore-errors (read-from-string ":ABCD")) (if (not (symbolp s)) @@ -102,7 +101,7 @@ "ABCD")))))) t) -(defun read-symbol-9-body (natoms maxlen) +(defun read-symbol.9-body (natoms maxlen) (let* ((chars (concatenate 'string "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -136,11 +135,11 @@ actual-string s2 sym :readably t) t))))))) -(deftest read-symbol-9 - (read-symbol-9-body 1000 100) +(deftest read-symbol.9 + (read-symbol.9-body 1000 100) 0) -(deftest read-symbol-10 +(deftest read-symbol.10 (handler-case (not (not (equal (symbol-name diff --git a/ansi-tests/rt-package.lsp b/ansi-tests/rt-package.lsp index 5aaf16f0..de988ae3 100644 --- a/ansi-tests/rt-package.lsp +++ b/ansi-tests/rt-package.lsp @@ -6,8 +6,9 @@ (eval-when ;;(:execute :compile-toplevel :load-toplevel) (load eval compile) - (defpackage :rt + (defpackage :regression-test (:use :cl) + (:nicknames :rtest #-lispworks :rt) (:export "*DO-TESTS-WHEN-DEFINED*" "*TEST*" @@ -21,4 +22,4 @@ "REM-TEST" ))) -(in-package :rt) +(in-package :regression-test) diff --git a/ansi-tests/rt-test.lsp b/ansi-tests/rt-test.lsp index 0b436329..c4beb955 100644 --- a/ansi-tests/rt-test.lsp +++ b/ansi-tests/rt-test.lsp @@ -27,7 +27,7 @@ (in-package :user) ;; (require "RT") -(use-package :rt) +(use-package :regression-tes) (defmacro setup (&rest body) `(do-setup '(progn ., body))) @@ -35,9 +35,9 @@ (defun do-setup (form) (let ((*test* nil) (*do-tests-when-defined* nil) - (rt::*entries* (list nil)) - (rt::*in-test* nil) - (rt::*debug* t) + (regression-test::*entries* (list nil)) + (regression-test::*in-test* nil) + (regression-test::*debug* t) result) (deftest t1 4 4) (deftest (t 2) 4 3) @@ -46,7 +46,7 @@ (with-output-to-string (*standard-output*) (setq result (multiple-value-list - (catch 'rt::*debug* (eval form)))))) + (catch 'regression-test::*debug* (eval form)))))) result)))) (defun normalize (string) diff --git a/ansi-tests/rt.lsp b/ansi-tests/rt.lsp index f218a59b..2e3ce500 100644 --- a/ansi-tests/rt.lsp +++ b/ansi-tests/rt.lsp @@ -23,7 +23,7 @@ ;This is the December 19, 1990 version of the regression tester. -(in-package :rt) +(in-package :regression-test) (defvar *test* nil "Current test name") (defvar *do-tests-when-defined* nil) diff --git a/ansi-tests/types-and-class.lsp b/ansi-tests/types-and-class.lsp index 5a6f7193..4f3b236a 100644 --- a/ansi-tests/types-and-class.lsp +++ b/ansi-tests/types-and-class.lsp @@ -6,7 +6,6 @@ ;; We should check for every type that NIL is a subtype, and T a supertype (in-package :cl-test) -(use-package :rt) (declaim (optimize (safety 3))) -- GitLab