diff --git a/ansi-tests/ansi-aux.lsp b/ansi-tests/ansi-aux.lsp index 173240abe29e2e824412474ae96356bf1a127a8f..3829282115b7f52af0b9659e5ae05d65e117065c 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 18eb01dccf08eb1afd73f2a54422ee2ff7edc8dd..f8b5fb4e9d1d6a0495f3831d95438826705656bf 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 54aa2eb863fc85b109a6bf66f851a7f781064cd8..550cacefee789183150e95e75bef2e9f54a7fcbc 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 e15fdaf2e8f2ae8bee0f7eeaa865f039ec6b6467..c665a81713bca33b6ad071c85284c50a7a79ccc4 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 cdcecef25c0b6891b14deb44e4ed62a2221df9dd..1ce11038c6fc19df3e106faebe41fbb15c06db3d 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 7d9a73fc53b293cb14621fdfc1faccd83a3ff013..43ddb610e6aa1bcb0e5aba727f69523e7c8be151 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 c605428cea31939ed3585bb397fbc4612a4797e5..0053f0dd9a23858da5f705136c04876e1cbc4ff1 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 1f6b79ee22034f35ab9b1f7cfd03b91fcc6eed03..100c1edde0dfa45298727560dd4e6fb2cc4b3f96 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 0ea94d4834ca1f8ba2bb7f5f4dd33775569a97fa..211003fb66dfd105cf0cd977310f855ba1c317a5 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 ec599146c369df6b4748a5625c0be8dff5debee7..445d0e85d6515861d4266874330fa91d41caeecc 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 916a1287f6c37af4a7b1931d3c865304a2d3e10b..6b1e3f001edb7de8e75a109f1a69b8df85480f08 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 d4d0061b306d94b2bd0ac82163c954fa62adbe89..baba3477a02c0a70663317ff79237d3009640f7b 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 8779df54ae427903293931550f8a63ca986460e8..fc625783cee0fd0347e5d5520037cd138e10abee 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 40cd25595909474aac100e27938f54cedf015a79..c807859b653c8902406a1b6321578b3157309340 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 2c545df776f88efe7457aac62021b6d2779eb958..2402b86a62b2fe8e768c150af37b52163a7c37e7 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 b1f699e29f22ca0f42a12475cbba902bff7ac71f..bdef6cc70baf6eea533aba7fe9719ca0e1d353ff 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 aaac91fa50b4ab9281b36ccebb9a0703e91adf7c..3b90821f619dd4db4fe74d5e0e2be1320a74b8b1 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 f29f020cb09bfe7ce9fe538c2ac012e31000b24f..89b2a8f669caca77d36754c80427fce76f9f112c 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 e51f8c6c501c0027f1b3b476eddb7a8935c8085f..8d0e2d59abe1b0e08ae8b0bf65a5f790512cf93a 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 8d34468a17544cb2cf0b8da43168042638bb4657..506bc0e41c2a260e91475cb10457d2a58b3911bd 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 41180137ede0e9fbef11a45cf46e75126f1f0ec6..679ca9d3fd0570f73adec134b5164b54da528617 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 c0d0e4bbc1929cd78280b9b531b7691393729206..1214a7251470c01c11e3fafa15249aea49b8fd49 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 e62d3fe217d8fe573731b89921df043ddb95b480..6fc53bebbc3212c8a001f365a7d4410233b71ea7 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 7a6a3ae03e7b28915825820be8936480ca5d8d8d..9457df03e8c9c8a8a1f248810039dba686c5a589 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 3c7a3a401bfe4f5b95db5c154f6b79a49e7ce40c..380d1d4788305a21763d4ac2434a037736eb7810 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 039dbcd075b8566da27502304f3ea27522945cbe..53cb22416700e3bb4ddb7168d0bb45715700e3c0 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 0cde94923486bf21c17ab455d591d23635dba73a..04b07cd7898234d0b732db33d3209ebd122f877b 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 6d09f50c6c992a3c77d847753956d6168ded29a7..baa1544da1835bfaee29a65eecfde0ee3f99b350 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 c06b7efe71fa5cb4ff462bb0d093ac264b9783a5..8d8110c4d8494fe6358ce09256b719b7462cae9d 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 2b72aac98f80c3a7d2c2f291abace7d41fb15fff..6078e30f62eefd899da8159732803f6aa98fd16e 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 fb019206b3c08c71e736984551c1281eb9c92a7e..6ec37c2bd51e91eb64f32f2ac987637f1e75b69c 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 5aaf16f0b7c87549b42bbbe669b503f6b8bf70f0..de988ae35e1005fc044b7d3f1b8e3c2920f5ce33 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 0b436329a767d189557ac6fdc3420c09ee208cef..c4beb955fbb89a4844aa264575a1ddf9999134e7 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 f218a59b67c5641c4f8fba9ffe4d4520816d6196..2e3ce5007506bbe23ce2c594503fede88ffc8d03 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 5a6f7193fb712d14339025324b627d5cf1dc700f..4f3b236a40892b5678aea94d27a802716b9597c4 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)))