From 0957d59ccfaf3db9aaf79a7f4909a40ea0ca0dcd Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Thu, 12 Dec 2002 11:47:36 +0000 Subject: [PATCH] 0.7.10.17: Adjust test file running environment so that *.pure.lisp tests are run with assertoid loaded. ... give assertoid its own package ... use it in run-tests.sh for *.pure.lisp ... also use it where applicable in *.impure.lisp --- TODO | 5 ++--- tests/arith.impure.lisp | 1 + tests/assertoid.lisp | 6 +++++- tests/character.pure.lisp | 2 -- tests/compiler.impure.lisp | 3 +-- tests/defstruct.impure.lisp | 3 +-- tests/map-tests.impure.lisp | 3 +-- tests/pathnames.impure.lisp | 3 +-- tests/print.impure.lisp | 14 +++++++++++++- tests/reader.impure.lisp | 3 +-- tests/run-tests.sh | 2 ++ tests/stream.impure.lisp | 3 +-- tests/type.impure.lisp | 12 +++++++++++- version.lisp-expr | 2 +- 14 files changed, 41 insertions(+), 21 deletions(-) diff --git a/TODO b/TODO index 2ec4472..8736a27 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,9 @@ for late 0.7.x: * test file reworking - ** *.pure.lisp tests run with assertoid.lisp loaded; assertoid - is moved to its own package, for use in *.impure.lisp. ** non-x86 ports now pass irrat.pure.lisp - ** sparc and ppc now pass bit-vector.impure-cload.lisp + ** ports with less than 256Mb of heap (sparc, ppc and mips) + now don't fail bit-vector.impure-cload.lisp * faster bootstrapping (both make.sh and slam.sh) ** added mechanisms for automatically finding dead code, and used them to remove dead code diff --git a/tests/arith.impure.lisp b/tests/arith.impure.lisp index 668ba38..11b1009 100644 --- a/tests/arith.impure.lisp +++ b/tests/arith.impure.lisp @@ -12,6 +12,7 @@ ;;;; more information. (load "assertoid.lisp") +(use-package "ASSERTOID") (defmacro define-compiled-fun (fun name) `(progn diff --git a/tests/assertoid.lisp b/tests/assertoid.lisp index 0469450..f50270b 100644 --- a/tests/assertoid.lisp +++ b/tests/assertoid.lisp @@ -12,7 +12,11 @@ ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. -(cl:in-package :cl-user) +(cl:defpackage "ASSERTOID" + (:use "CL") + (:export "GRAB-CONDITION" "RAISES-ERROR?" "ASSERTOID")) + +(cl:in-package "ASSERTOID") (defmacro grab-condition (&body body) `(nth-value 1 diff --git a/tests/character.pure.lisp b/tests/character.pure.lisp index 8546abc..97a2590 100644 --- a/tests/character.pure.lisp +++ b/tests/character.pure.lisp @@ -13,8 +13,6 @@ (cl:in-package :cl-user) -(load "assertoid.lisp") - ;;; ANSI's specification of #'CHAR-NAME imposes these constraints. ;;; ;;; (Obviously, the numeric values in this test implicitly assume diff --git a/tests/compiler.impure.lisp b/tests/compiler.impure.lisp index a19fb7e..0a530bd 100644 --- a/tests/compiler.impure.lisp +++ b/tests/compiler.impure.lisp @@ -15,9 +15,8 @@ ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. -(cl:in-package :cl-user) - (load "assertoid.lisp") +(use-package "ASSERTOID") ;;; Old CMU CL code assumed that the names of "keyword" arguments are ;;; necessarily self-evaluating symbols, but ANSI Common Lisp allows diff --git a/tests/defstruct.impure.lisp b/tests/defstruct.impure.lisp index cc9ab9b..b895b22 100644 --- a/tests/defstruct.impure.lisp +++ b/tests/defstruct.impure.lisp @@ -9,9 +9,8 @@ ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. -(cl:in-package :cl-user) - (load "assertoid.lisp") +(use-package "ASSERTOID") ;;;; examples from, or close to, the Common Lisp DEFSTRUCT spec diff --git a/tests/map-tests.impure.lisp b/tests/map-tests.impure.lisp index 930fa66..d618309 100644 --- a/tests/map-tests.impure.lisp +++ b/tests/map-tests.impure.lisp @@ -11,9 +11,8 @@ ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. -(cl:in-package :cl-user) - (load "assertoid.lisp") +(use-package "ASSERTOID") ;;; tests of MAP ;;; FIXME: Move these into their own file. diff --git a/tests/pathnames.impure.lisp b/tests/pathnames.impure.lisp index d177230..f939a49 100644 --- a/tests/pathnames.impure.lisp +++ b/tests/pathnames.impure.lisp @@ -14,9 +14,8 @@ ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. -(in-package "CL-USER") - (load "assertoid.lisp") +(use-package "ASSERTOID") (setf (logical-pathname-translations "demo0") '(("**;*.*.*" "/tmp/"))) diff --git a/tests/print.impure.lisp b/tests/print.impure.lisp index c12fe05..b592d84 100644 --- a/tests/print.impure.lisp +++ b/tests/print.impure.lisp @@ -1,6 +1,18 @@ -(in-package :cl-user) +;;;; miscellaneous tests of printing stuff + +;;;; This software is part of the SBCL system. See the README file for +;;;; more information. +;;;; +;;;; While most of SBCL is derived from the CMU CL system, the test +;;;; files (like this one) were written from scratch after the fork +;;;; from CMU CL. +;;;; +;;;; This software is in the public domain and is provided with +;;;; absolutely no warranty. See the COPYING and CREDITS files for +;;;; more information. (load "assertoid.lisp") +(use-package "ASSERTOID") ;;; We should be able to output X readably (at least when *READ-EVAL*). (defun assert-readable-output (x) diff --git a/tests/reader.impure.lisp b/tests/reader.impure.lisp index 560ea98..84be1cf 100644 --- a/tests/reader.impure.lisp +++ b/tests/reader.impure.lisp @@ -13,9 +13,8 @@ ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. -(in-package :cl-user) - (load "assertoid.lisp") +(use-package "ASSERTOID") ;;; Bug 30, involving mistakes in binding the read table, made this ;;; code fail. diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 3c72812..3a4d283 100644 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -58,6 +58,8 @@ echo //running '*.pure.lisp' tests echo //i.e. *.pure.lisp ( echo "(progn" +echo " (progn (format t \"//loading assertoid.lisp~%\") (load \"assertoid.lisp\"))" +echo " (use-package \"ASSERTOID\")" for f in *.pure.lisp; do if [ -f $f ]; then echo " (progn (format t \"//running $f test~%\") (load \"$f\"))" diff --git a/tests/stream.impure.lisp b/tests/stream.impure.lisp index 0908560..d2891f4 100644 --- a/tests/stream.impure.lisp +++ b/tests/stream.impure.lisp @@ -11,9 +11,8 @@ ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. -(in-package :cl-user) - (load "assertoid.lisp") +(use-package "ASSERTOID") ;;; type errors for inappropriate stream arguments, fixed in ;;; sbcl-0.7.8.19 diff --git a/tests/type.impure.lisp b/tests/type.impure.lisp index adb9bf6..da143e3 100644 --- a/tests/type.impure.lisp +++ b/tests/type.impure.lisp @@ -1,6 +1,16 @@ -(in-package :cl-user) +;;;; This software is part of the SBCL system. See the README file for +;;;; more information. +;;;; +;;;; While most of SBCL is derived from the CMU CL system, the test +;;;; files (like this one) were written from scratch after the fork +;;;; from CMU CL. +;;;; +;;;; This software is in the public domain and is provided with +;;;; absolutely no warranty. See the COPYING and CREDITS files for +;;;; more information. (load "assertoid.lisp") +(use-package "ASSERTOID") (defmacro assert-nil-nil (expr) `(assert (equal '(nil nil) (multiple-value-list ,expr)))) diff --git a/version.lisp-expr b/version.lisp-expr index 481f87c..b7ea4b8 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -18,4 +18,4 @@ ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.7.10.16" +"0.7.10.17" -- 1.7.10.4