Changeset 15385

Timestamp:

09/26/20 11:23:43 (2 years ago)

Author:

Mark Evenson

Message:

ci: various maintenance changes

Travis CI now uses versions of STATIC-VECTORS, CL+SSL, and CFFI from
Quicklisp distribution as all outstanding patches have been absorbed
upstream. While this means testing will change depending on the
current Quicklisp distribution when the tests are invoked, it will
more properly reflect common usage of these systems.

Overhaul ABCL-PROVE system definition explicitly enumerating tests for
more deterministic behavior. Remove unnecessary ABCL-PROVE/T
sub-system. Remove testing of JEANNIE from ABCL-PROVE so that it has
no dependencies external to the ABCL source tree.

Add TIME forms to ABCL/TEST/ANSI invocation.

Location:

trunk/abcl

Files:

• .travis.yml (modified) (2 diffs)
• abcl-prove.asd (modified) (1 diff)
• ci/abcl-prove.lisp (deleted)
• ci/install-cffi.bash (modified) (1 diff)
• ci/install-cl+ssl.bash (modified) (1 diff)
• ci/install-jeannie.bash (modified) (1 diff)
• ci/install-quicklisp.lisp (modified) (1 diff)
• ci/install-static-vectors.bash (modified) (1 diff)
• ci/test-abcl-introspect.lisp (modified) (1 diff)
• ci/test-abcl-prove.lisp (added)
• ci/test-abcl.lisp (modified) (1 diff)
• ci/test-ansi.lisp (modified) (1 diff)
• ci/test-jeannie.lisp (added)
• t/rdf.lisp (deleted)

trunk/abcl/.travis.yml

@@ -56 +56 @@
 
   # Install the patched version of cl+ssl
-  - bash -x ${ABCL_ROOT}/ci/install-cl+ssl.bash
+  #  - bash -x ${ABCL_ROOT}/ci/install-cl+ssl.bash
 
   # Install the patched version of cffi
-  - bash -x ${ABCL_ROOT}/ci/install-cffi.bash
+  # - bash -x ${ABCL_ROOT}/ci/install-cffi.bash
+
+  # Install the patched version of static-vectors
+  # - bash -x ${ABCL_ROOT}/ci/install-static-vectors.bash
+
+  # Install Jeannie for testing
+  - bash -x ${ABCL_ROOT}/ci/install-jeannie.bash
 
   # Install the ANSI-TEST suite
   - bash -x ${ABCL_ROOT}/ci/install-ansi-test.bash
 
-  # Install the patched version of static-vectors
-  - bash -x ${ABCL_ROOT}/ci/install-static-vectors.bash
-
-  # Install Jeannie for testing
-  - bash -x ${ABCL_ROOT}/ci/install-jeannie.bash
 
 # TODO: figure out how to add abcl to our path
 
 script:
-  - ${ABCL_ROOT}/abcl --batch --load ${ABCL_ROOT}/ci/abcl-prove.lisp
+  - ${ABCL_ROOT}/abcl --batch --load ${ABCL_ROOT}/ci/test-abcl-prove.lisp
   - ${ABCL_ROOT}/abcl --batch --load ${ABCL_ROOT}/ci/test-static-vectors.lisp
   - ${ABCL_ROOT}/abcl --batch --load ${ABCL_ROOT}/ci/test-cffi.lisp
@@ -79 +80 @@
   - ${ABCL_ROOT}/abcl --batch --load ${ABCL_ROOT}/ci/test-abcl-introspect.lisp
   - ${ABCL_ROOT}/abcl --batch --load ${ABCL_ROOT}/ci/test-abcl.lisp
+  - ${ABCL_ROOT}/abcl --batch --load ${ABCL_ROOT}/ci/test-jeannie.lisp
   # IRONCLAD takes a long time to test, so we place it near the end
   - ${ABCL_ROOT}/abcl --batch --load ${ABCL_ROOT}/ci/test-ironclad.lisp

trunk/abcl/abcl-prove.asd

@@ -1 +1 @@
 (defsystem :abcl-prove
-  :version "1.7.0"
-  :depends-on (prove))
+  :version "1.8.0"
+  :defsystem-depends-on (prove-asdf)
+  :depends-on (prove)
+  :perform (test-op (o c)
+              (uiop:symbol-call :prove-asdf 'run-test-system c))
+  :components ((:module t
+                :components ((:test-file "abcl-asdf")
+                             (:test-file "arithmetic")
+                             (:test-file "ash")
+                             (:test-file "byte-vectors")
+                             (:test-file "compiler-stack-inconsistency")
+                             (:test-file "compiler")
+                             (:test-file "decode-float")
+                             (:test-file "disassemble")
+                             (:test-file "format-dollar")
+                             (:test-file "java-arrays")
+                             (:test-file "java-call-sites")
+                             (:test-file "jcoerce-numerics")
+                             (:test-file "pathname")
+                             (:test-file "print-symbol")
+                             (:test-file "read-suppress")
+                             (:test-file "run-program")
+                             (:test-file "url-stream")))))
 
-(defsystem :abcl-prove/t
-  :depends-on (:abcl-prove :abcl)
-  :perform
-  (asdf:test-op (op c)
-     ;; (ignore c) ;;; any reference triggers all source artifacts           
-    (ignore-errors
-      (dolist (p (directory
-        (merge-pathnames "*.lisp"
-                         (asdf:system-relative-pathname :abcl "t/"))))
-        (uiop:symbol-call :prove :run p)))))
+
+
 
 

trunk/abcl/ci/install-cffi.bash

@@ -3 +3 @@
 dir="cffi"
 uri="https://github.com/armedbear/${dir}"
-root="${HOME}/quicklisp/local-projects"
+root="${HOME}/common-lisp"
 tag="abcl/easye-20200602a"
 

trunk/abcl/ci/install-cl+ssl.bash

@@ -3 +3 @@
 dir="cl-plus-ssl"
 uri="https://github.com/armedbear/${dir}"
-root="${HOME}/quicklisp/local-projects"
+root="${HOME}/common-lisp"
 tag="easye/stream-fd-20200603a"
 

trunk/abcl/ci/install-jeannie.bash

@@ -3 +3 @@
 dir="jeannie"
 uri="https://github.com/easye/${dir}"
-root="${HOME}/quicklisp/local-projects"
+root="${HOME}/common-lisp"
 tag="master"
 

trunk/abcl/ci/install-quicklisp.lisp

@@ -2 +2 @@
 (require :asdf)
 (require :abcl-contrib)
-(asdf:load-system :quicklisp-abcl :force t)
+
+(asdf:load-system :quicklisp-abcl)
 (let ((ql-util::*do-not-prompt* t))
   (ql:add-to-init-file))

trunk/abcl/ci/install-static-vectors.bash

@@ -3 +3 @@
 dir="static-vectors"
 uri="https://github.com/armedbear/${dir}"
-root="${HOME}/quicklisp/local-projects"
+root="${HOME}/quicklisp/common-lisp"
 tag="abcl/easye-20200603a"
 

trunk/abcl/ci/test-abcl-introspect.lisp

@@ -1 +1 @@
 (ql:quickload :abcl-introspect-test)
+
 (time 
  (asdf:test-system :abcl-introspect))

trunk/abcl/ci/test-abcl.lisp

@@ -1 +1 @@
 (require :asdf)
 
-(asdf:load-system :abcl/test/lisp)
+(time 
+ (asdf:test-system :abcl/test/lisp))
 
-(asdf:test-system :abcl/test/lisp)

trunk/abcl/ci/test-ansi.lisp

@@ -1 +1 @@
 (require :asdf)
-
-(asdf:load-system :abcl)
 
 (time