Commit f9c5839a authored by Mark Evenson's avatar Mark Evenson

Merge github/master through...

Merge github/master through <https://github.com/armedbear/abcl/commit/1629562e246289ddfecfb92b050310bb6368f6c2>.
parents 6134fc10 1629562e
......@@ -50,6 +50,7 @@ script:
- ${TRAVIS_BUILD_DIR}/abcl --batch --load ${TRAVIS_BUILD_DIR}/ci/test-cffi.lisp
- ${TRAVIS_BUILD_DIR}/abcl --batch --load ${TRAVIS_BUILD_DIR}/ci/test-cl+ssl.lisp
- ${TRAVIS_BUILD_DIR}/abcl --batch --load ${TRAVIS_BUILD_DIR}/ci/test-abcl.lisp
- ${TRAVIS_BUILD_DIR}/abcl --batch --load ${TRAVIS_BUILD_DIR}/ci/abcl-prove.lisp
- ${TRAVIS_BUILD_DIR}/abcl --batch --load ${TRAVIS_BUILD_DIR}/ci/test-ansi.lisp
......
;;;; FIXME: resolve this Quicklisp/ASDF schism so that this is not necessary
(defsystem :abcl-prove
:depends-on (prove))
(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)))))
;;; -*- Mode: LISP; Syntax: COMMON-LISP -*-
(defsystem abcl
:version "1.5.0"
:version "1.6.1"
:in-order-to ((test-op (test-op "abcl/test/lisp"))))
(defsystem abcl/test/lisp
:version "1.5.0"
:version "1.6.1"
:description "Test ABCL with the its own collection of unit tests."
:perform (test-op (o s)
(uiop:symbol-call :abcl.test.lisp '#:run))
......@@ -62,25 +62,13 @@
;;; FIXME Currently requires ACBL-CONTRIB and QUICKLISP-ABCL to be
;;; loaded, but can't seem to put in the :defsystem-depends-on stanza
(defsystem abcl/t
:description "Tests for ABCL via PROVE."
:defsystem-depends-on (prove-asdf)
:depends-on (abcl
prove)
:perform (asdf:test-op (op c)
(uiop:symbol-call :prove-asdf :run-test-system c))
:components ((:module package
:pathname "t/"
:components ((:file "package")))
(:module java6
:depends-on (package)
:pathname "t/"
:components ((:test-file "run-program")))
(:module build
:depends-on (package)
:pathname "t/"
:components ((:test-file "resolve-multiple-maven-dependencies")
(:test-file "disassemble")
(:test-file "pathname")))))
:description "DEPRECATED tests for ABCL via PROVE see ABCL-PROVE."
:version "1.6.1"
:perform
(asdf:test-op (op c)
(ql:quickload :abcl-prove)
(asdf:load-system :abcl-prove)
(asdf:test-system :abcl-prove/t)))
;;;
;;; ASDF definitions and the ANSI-TEST suite
......
(ql:quickload :abcl-prove)
(asdf:load-system :abcl-prove)
(asdf:test-system :abcl-prove/t)
;;; also works as :abcl/t under some definitions
(prove:plan 1)
(prove:ok
(compile-file (asdf:system-relative-pathname :abcl "t/eg/compiler-fails-on-inline-recursion.lisp")))
;;; FIXME test shouldn't signal error
(prove:is-error
(compile-file (asdf:system-relative-pathname :abcl "t/eg/compiler-fails-on-inline-recursion.lisp"))
'compiler-error
"FIXME: this test should not result in a STORAGE-CONDITION as a compiler error")
(prove:finalize)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment