Merge pull request #1458 from clasp-developers/ansi

ANSI test changes

Author: yitzchak

repos.sexp

@@ -5,9 +5,9 @@
 ;;;;   4. src/ - C/C++ dependencies for iclasp
 ;;;;   5. extensions/ - extensions and their dependencies
 ((:name :ansi-test
-  :repository "https://gitlab.common-lisp.net/yitzchak/ansi-test"
+  :repository "https://gitlab.common-lisp.net/ansi-test/ansi-test"
   :directory "dependencies/ansi-test/"
-  :branch "bytecode")
+  :branch "master")
  (:name :cl-bench
   :repository "https://gitlab.common-lisp.net/ansi-test/cl-bench.git"
   :directory "dependencies/cl-bench/"

src/koga/configure.lisp

@@ -647,8 +647,8 @@ is not compatible with snapshots.")
                                                          (list (make-source #P"clasprc.lisp" :variant))
                                                          :jupyter-kernel
                                                          (list (make-source #P"jupyter-kernel.lisp" :variant))
-                                                         :ansi-test-subset
-                                                         (list (make-source #P"ansi-test-subset.lisp" :build))
+                                                         :ansi-test
+                                                         (list (make-source #P"ansi-test.lisp" :build))
                                                          :bench
                                                          (list (make-source #P"bench.lisp" :build))
                                                          :ninja

src/koga/ninja.lisp

@@ -149,11 +149,7 @@
                     :description "Running benchmarks"
                     :pool "console")
   (ninja:write-rule output-stream :ansi-test
-                    :command "$clasp --norc --base --feature ignore-extensions --load \"../dependencies/ansi-test/doit-clasp.lsp\""
-                    :description "Running ANSI tests"
-                    :pool "console")
-  (ninja:write-rule output-stream :ansi-test-subset
-                    :command "$clasp --norc -t c --feature ignore-extensions --load ansi-test-subset.lisp"
+                    :command "$clasp --norc --base --feature ignore-extensions --load ansi-test.lisp"
                     :description "Running ANSI tests"
                     :pool "console")
   (ninja:write-rule output-stream :test-random-integer
@@ -758,10 +754,6 @@
                      :clasp (make-source "iclasp" :variant)
                      :inputs (list (build-name "cclasp"))
                      :outputs (list (build-name "ansi-test")))
-  (ninja:write-build output-stream :ansi-test-subset
-                     :clasp (make-source "iclasp" :variant)
-                     :inputs (list (build-name "cclasp"))
-                     :outputs (list (build-name "ansi-test-subset")))
   (ninja:write-build output-stream :test-random-integer
                      :clasp (make-source "iclasp" :variant)
                      :inputs (list (build-name "cclasp"))

src/koga/scripts.lisp

@@ -285,12 +285,15 @@ exec $(dirname \"$0\")/iclasp -f ignore-extensions --base \"$@\""))
   (cl-bench::bench-analysis-page))
 (ext:quit)"))
 
-(defmethod print-prologue (configuration (name (eql :ansi-test-subset)) output-stream)
-  (format output-stream "(setf *default-pathname-defaults*
-      (truename (make-pathname :directory '(:relative :up \"dependencies\" \"ansi-test\"))))
-(load #P\"doit1.lsp\")
-(load #P\"gclload2.lsp\")
-(dolist (name (core:split (string-upcase (ext:getenv \"ANSI_TEST_SUBSET\")) \",\"))
-  (write-line name)
-  (rt:do-test (find-symbol name :cl-test) :catch-errors nil))
-(ext:quit)"))
+(defmethod print-prologue (configuration (name (eql :ansi-test)) output-stream)
+  (format output-stream "~
+(let ((suite (ext:getenv \"ANSI_TEST_SUITE\")))
+  (cond (suite
+         (let ((*default-pathname-defaults* (truename #P\"../dependencies/ansi-test/\")))
+           (load #P\"gclload1.lsp\")
+           (load (make-pathname :directory (list :relative suite)
+                                :name \"load\"
+                                :type \"lsp\"))))
+        (t
+         (load #P\"../dependencies/ansi-test/init.lsp\"))))
+(rt:do-tests :exit t :expected-failures \"../tools-for-build/ansi-test-expected-failures.sexp\")"))

tools-for-build/ansi-test-expected-failures.sexp

@@ -0,0 +1,107 @@
+;;; might work
+;;;  MACROLET.36
+
+;;; READ-SYMBOL.19
+;;; ARRAY-T.3.1 
+;;; THE.6
+;;; THE.22
+;;; MISC.132
+;;; fails sometimes
+;;; FORMAT.E.26
+
+:NIL-VECTORS-ARE-STRINGS
+:ALLOW-NIL-ARRAYS
+:MAKE-CONDITION-WITH-COMPOUND-NAME
+:NO-FLOATING-POINT-UNDERFLOW-BY-DEFAULT
+
+;;; These aren't true failures. They only happen because we use LOAD.
+LOAD-PATHNAME.1
+LOAD-TRUENAME.1
+
+PEEK-CHAR.ERROR.1
+PRINT.SYMBOL.RANDOM.3
+PRINT.SYMBOL.RANDOM.4
+PRINT.DOUBLE-FLOAT.RANDOM
+PRINT.LONG-FLOAT.RANDOM
+
+;;; Clasp extends graphic-char-p to include space-like characters
+FORMAT.C.2A
+FORMATTER.C.2A
+
+;;; these no longer crash, but fail
+EXP.ERROR.4
+EXP.ERROR.5
+EXP.ERROR.6
+EXP.ERROR.7
+EXP.ERROR.8
+EXP.ERROR.9
+EXP.ERROR.10
+EXP.ERROR.11
+EXPT.ERROR.6
+EXPT.ERROR.4
+EXPT.ERROR.5
+EXPT.ERROR.7
+EXPT.ERROR.8
+EXPT.ERROR.9 
+EXPT.ERROR.10
+EXPT.ERROR.11
+;;; FIND-ALL-SYMBOLS.1
+FUNCALL.ERROR.3
+ATAN.IEEE.2 
+READ-SUPPRESS.17 
+CTYPECASE.15
+CTYPECASE.16
+LOOP.1.39
+LOOP.1.40
+LOOP.1.41
+LOOP.1.42
+LOOP.1.43
+DEFGENERIC.ERROR.20
+DEFGENERIC.ERROR.21
+CALL-NEXT-METHOD.ERROR.1
+CALL-NEXT-METHOD.ERROR.2
+DEFMETHOD.ERROR.14
+DEFMETHOD.ERROR.15
+UPGRADED-ARRAY-ELEMENT-TYPE.8
+ATAN.ERROR.5
+MAP.ERROR.11
+TYPE-OF.1
+TYPE-OF.4
+FORMAT.LOGICAL-BLOCK.23
+COMPILE-FILE.2
+DEFCLASS.FORWARD-REF.3
+MAKE-LOAD-FORM.ORDER.3
+MAKE-LOAD-FORM.ORDER.4
+MAKE-LOAD-FORM.ORDER.5
+MAKE-LOAD-FORM.ORDER.6
+MAKE-LOAD-FORM.ORDER.7
+MAKE-LOAD-FORM.ORDER.8 
+MAKE-LOAD-FORM.ORDER.9
+MAKE-LOAD-FORM.ORDER.10
+MAKE-LOAD-FORM.ORDER.11
+MAKE-LOAD-FORM.ORDER.12
+MAKE-LOAD-FORM.ORDER.13
+MAKE-LOAD-FORM.ORDER.14
+BUTLAST.FOLD.1
+BUTLAST.FOLD.2
+BUTLAST.FOLD.3
+DEFSTRUCT.ERROR.3
+DEFSTRUCT.ERROR.4
+ALL-EXPORTED-CL-CLASS-NAMES-ARE-VALID
+MAKE-TWO-WAY-STREAM.13
+FORMAT.E.6
+FORMAT.E.26
+MISC.544 
+CMUCL-TYPE-PROP.23
+CLEAR-INPUT.1
+CLEAR-INPUT.2
+CLEAR-INPUT.3
+CLEAR-INPUT.4
+PPRINT-NEWLINE.FILL.7
+
+DEFINE-METHOD-COMBINATION-LONG.05.2
+DEFINE-METHOD-COMBINATION-LONG.06.2
+DEFINE-METHOD-COMBINATION-LONG.11.1
+DEFINE-METHOD-COMBINATION-LONG.11.2
+DEFINE-METHOD-COMBINATION-LONG.11.3
+DEFINE-METHOD-COMBINATION-LONG.11.4