diff --git a/ansi-tests/ansi-aux.lsp b/ansi-tests/ansi-aux.lsp index 3bf447cfd586667190b2aca10309ad509e07c0ca..ea303d81d21453e30fe369e15787963c09bdedb8 100644 --- a/ansi-tests/ansi-aux.lsp +++ b/ansi-tests/ansi-aux.lsp @@ -1267,8 +1267,8 @@ the condition to go uncaught if it cannot be classified." (defmacro defstruct* (&body args) `(eval-when (load eval compile) - (ignore-errors - (defstruct ,@args)))) + (handler-case (eval '(defstruct ,@args)) + (serious-condition () nil)))) (defun sort-package-list (x) diff --git a/ansi-tests/gclload2.lsp b/ansi-tests/gclload2.lsp index ab760ff7d07743cebcf3421f21d189e207da5cb9..79c12e1856d868df956bf355ed2015ee7e783b1e 100644 --- a/ansi-tests/gclload2.lsp +++ b/ansi-tests/gclload2.lsp @@ -29,7 +29,7 @@ ;;; Tests of packages -#-ecl (load "packages.lsp") +(load "packages.lsp") ;;; Tests of sequences (load "load-sequences.lsp") diff --git a/ansi-tests/load-structures.lsp b/ansi-tests/load-structures.lsp index d288e99db5e623a7ccb2c9fc3f2213cfee5a696b..826155058093d4efa95d0e40f504be0a31755383 100644 --- a/ansi-tests/load-structures.lsp +++ b/ansi-tests/load-structures.lsp @@ -3,4 +3,4 @@ (load "structure-00.lsp") (load "structures-01.lsp") (load "structures-02.lsp") -#-ecl (load "structures-03.lsp") \ No newline at end of file +(load "structures-03.lsp") \ No newline at end of file diff --git a/ansi-tests/packages-00.lsp b/ansi-tests/packages-00.lsp index 0f951e3c610274a7c465a0f23637a8d704e52a26..355693091bb231873ed4ff731625f28d7cb39c24 100644 --- a/ansi-tests/packages-00.lsp +++ b/ansi-tests/packages-00.lsp @@ -5,35 +5,41 @@ (in-package :cl-test) (declaim (optimize (safety 3))) - -(defpackage "A" - (:use) - (:nicknames "Q") - (:export "FOO")) -(defpackage "B" - (:use "A") - (:export "BAR")) +(ignore-errors + (defpackage "A" + (:use) + (:nicknames "Q") + (:export "FOO"))) -(defpackage "DS1" - (:use) - (:intern "C" "D") - (:export "A" "B")) +(ignore-errors + (defpackage "B" + (:use "A") + (:export "BAR"))) -(defpackage "DS2" - (:use) - (:intern "E" "F") - (:export "G" "H" "A")) +(ignore-errors + (defpackage "DS1" + (:use) + (:intern "C" "D") + (:export "A" "B"))) -(defpackage "DS3" - (:shadow "B") - (:shadowing-import-from "DS1" "A") - (:use "DS1" "DS2") - (:export "A" "B" "G" "I" "J" "K") - (:intern "L" "M")) +(ignore-errors + (defpackage "DS2" + (:use) + (:intern "E" "F") + (:export "G" "H" "A"))) -(defpackage "DS4" - (:shadowing-import-from "DS1" "B") - (:use "DS1" "DS3") - (:intern "X" "Y" "Z") - (:import-from "DS2" "F")) +(ignore-errors + (defpackage "DS3" + (:shadow "B") + (:shadowing-import-from "DS1" "A") + (:use "DS1" "DS2") + (:export "A" "B" "G" "I" "J" "K") + (:intern "L" "M"))) + +(ignore-errors + (defpackage "DS4" + (:shadowing-import-from "DS1" "B") + (:use "DS1" "DS3") + (:intern "X" "Y" "Z") + (:import-from "DS2" "F"))) diff --git a/ansi-tests/packages.lsp b/ansi-tests/packages.lsp index dc6b38ea275308c72a80f9b6d7da1fd5e83be598..bdf8a87cef3e7c1943787afa54e0bb9280a3a5b6 100644 --- a/ansi-tests/packages.lsp +++ b/ansi-tests/packages.lsp @@ -21,6 +21,6 @@ (load "packages-14.lsp") (load "packages-15.lsp") (load "packages-16.lsp") -(load "packages-17.lsp") +(ignore-errors (load "packages-17.lsp")) (load "packages-18.lsp") (load "packages-19.lsp")