From 0d03a145f45acd11c4adae4ebdf6be023a774e97 Mon Sep 17 00:00:00 2001
From: pfdietz <pfdietz@localhost>
Date: Thu, 6 Mar 2003 04:11:48 +0000
Subject: [PATCH] Fixed up so that ecl tries to run all the tests without
 crashing.

---
 ansi-tests/ansi-aux.lsp        |  4 +--
 ansi-tests/gclload2.lsp        |  2 +-
 ansi-tests/load-structures.lsp |  2 +-
 ansi-tests/packages-00.lsp     | 60 +++++++++++++++++++---------------
 ansi-tests/packages.lsp        |  2 +-
 5 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/ansi-tests/ansi-aux.lsp b/ansi-tests/ansi-aux.lsp
index 3bf447cf..ea303d81 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 ab760ff7..79c12e18 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 d288e99d..82615505 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 0f951e3c..35569309 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 dc6b38ea..bdf8a87c 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")
-- 
GitLab