From a4df9b2d2cd241a13c4b10f83c16ef194439de50 Mon Sep 17 00:00:00 2001 From: pfdietz <pfdietz@localhost> Date: Thu, 20 Feb 2003 13:12:14 +0000 Subject: [PATCH] Various changes to get the test suite to run (sort of) under ECL. --- ansi-tests/char-aux.lsp | 6 +++++- ansi-tests/gclload2.lsp | 4 ++-- ansi-tests/makefile | 2 +- ansi-tests/packages-00.lsp | 2 +- ansi-tests/packages.lsp | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ansi-tests/char-aux.lsp b/ansi-tests/char-aux.lsp index 7db20e11..61d6d42f 100644 --- a/ansi-tests/char-aux.lsp +++ b/ansi-tests/char-aux.lsp @@ -272,6 +272,7 @@ t))) (defun name-char.1.body () + (declare (optimize (safety 3))) (loop for x in *universe* for s = (catch-type-error (string x)) always @@ -279,4 +280,7 @@ (let ((c (name-char x))) (or (not c) (characterp c) - (string-equal (char-name c) s)))))) \ No newline at end of file + (let ((name (char-name c))) + (declare (type (or null string) name)) + (and name + (string-equal name s)))))))) diff --git a/ansi-tests/gclload2.lsp b/ansi-tests/gclload2.lsp index 70bf291c..0f43faeb 100644 --- a/ansi-tests/gclload2.lsp +++ b/ansi-tests/gclload2.lsp @@ -196,7 +196,7 @@ ;;; Tests of packages -(load "packages.lsp") +#-ecl (load "packages.lsp") ;;; Tests of sequences @@ -245,7 +245,7 @@ (load "structure-00.lsp") (load "structures-01.lsp") (load "structures-02.lsp") -(load "structures-03.lsp") +#-ecl (load "structures-03.lsp") ;;; Tests of types and classes diff --git a/ansi-tests/makefile b/ansi-tests/makefile index 63384d87..2b72aac9 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 *~ *.fn *.x86f *.fasl rt/*.o rt/*.fasl rt/*.fn rt/*~ rt/*.x86f rt/*.fasl + rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl diff --git a/ansi-tests/packages-00.lsp b/ansi-tests/packages-00.lsp index 6783c6a2..0f951e3c 100644 --- a/ansi-tests/packages-00.lsp +++ b/ansi-tests/packages-00.lsp @@ -36,4 +36,4 @@ (:shadowing-import-from "DS1" "B") (:use "DS1" "DS3") (:intern "X" "Y" "Z") - (:import-from "DS2" "F"))9 + (:import-from "DS2" "F")) diff --git a/ansi-tests/packages.lsp b/ansi-tests/packages.lsp index 3056810e..dc6b38ea 100644 --- a/ansi-tests/packages.lsp +++ b/ansi-tests/packages.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Loader for files containing package tests -(compile-and-load "packages-00.lsp") +(load "packages-00.lsp") (load "packages-01.lsp") (load "packages-02.lsp") (load "packages-03.lsp") -- GitLab