Changeset 14922


Ignore:
Timestamp:
12/13/16 19:38:03 (5 years ago)
Author:
Mark Evenson
Message:

abcl-asdf: repackage with sub systems; renable test suite

#+BEGIN_SRC lisp

(asdf:test-system :abcl-asdf)

#+END_SRC

Move abcl-asdf tests over to PROVE.

PROVE currently needs to be special cased for newer ASDF version.
Install into Quicklisp local projects via:

#+BEGIN_SRC sh

cd ~/quicklisp/local-projects && git clone https://github.com/easye/prove

#+END_SRC

Patch with <https://github.com/easye/prove> for open
<https://github.com/fukamachi/prove/pull/34>.

Location:
trunk/abcl/contrib
Files:
2 added
1 deleted
2 edited
3 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd

    r14900 r14922  
    11;;;; -*- Mode: LISP -*-
     2(in-package :cl-user)
    23
    34(asdf:defsystem :abcl-asdf
    45  :author "Mark Evenson"
    5   :version "1.5.1"
    6   :description "<> asdf:defsystem <urn:abcl.org/release/1.5.0/contrib/abcl-asdf#1.5.1>"
     6  :version "1.6.0"
     7  :description "<> asdf:defsystem <urn:abcl.org/release/1.5.0/contrib/abcl-asdf#1.6.0>"
    78  :depends-on (jss)
    89  :components
    9   ((:module packages :pathname ""
     10  ((:module package :pathname ""
    1011            :components
    11             ((:file "packages")))
     12            ((:file "package")))
    1213   (:module base :pathname ""
    1314            :components
     
    1718             (:file "maven-embedder"
    1819                    :depends-on ("abcl-asdf" "asdf-jar")))
    19             :depends-on (packages))))
     20            :depends-on (package)))
     21  :in-order-to ((asdf:test-op (asdf:test-op abcl-asdf/test))))
    2022
    21 (asdf:defsystem :abcl-asdf-test
     23(asdf:defsystem :abcl-asdf/test
    2224  :author "Mark Evenson"
    23   :depends-on (abcl abcl-test-lisp abcl-asdf rt)
    24   :components ((:module tests :serial t
    25                         :components ((:file "example")
    26                                      (:file "maven")
    27                                      (:file "test")))))
     25  :description "<> asdf:defsystem <urn:abcl.org/release/1.5.0/contrib/abcl-asdf/test#1.6.0>"
     26  :defsystem-depends-on (prove-asdf)
     27  :depends-on (abcl-asdf ;; our dependencies
     28               ;; Actual testing framework
     29               prove
     30               log4j)
     31  :components ((:module package :pathname "t/"
     32                        :components ((:file "package")))
     33               (:module tests :pathname "t/" :serial t
     34                        :depends-on (package)
     35                        :components ((:test-file "log4j")
     36                                     (:test-file "maven"))))
     37  :perform (asdf:test-op (op c)
     38                         (uiop:symbol-call :prove-asdf 'run-test-system c)))
    2839
    29 
    30 (defmethod asdf:perform ((o asdf:test-op) (c (eql (asdf:find-system 'abcl-asdf-test))))
    31   (funcall (intern (symbol-name 'run) 'abcl-asdf-test)))
    32 
    33 (defmethod asdf:perform ((o asdf:test-op) (c (eql (asdf:find-system 'abcl-asdf))))
    34   (asdf:load-system :abcl-asdf-test)
    35   (asdf:test-system :abcl-asdf-test))
    36 
    37  ;;; FIXME
    38 #+nil
    39 (defmethod asdf:perform ((o asdf:test-op) (c (eql (asdf:find-system 'abcl-asdf))))
    40   "Invoke tests with (asdf:test-system 'abcl-asdf)."
    41   (asdf:load-system 'abcl)
    42   (asdf:load-system 'abcl-test-lisp)
    43   (asdf:load-system 'abcl-asdf-test)
    44   (funcall (intern (symbol-name 'run) 'abcl-asdf-test)))
    45 
  • trunk/abcl/contrib/abcl-asdf/maven-embedder.lisp

    r14919 r14922  
    364364    (return-from make-proxy nil))
    365365  (let* ((p (pathname *maven-http-proxy*))
    366          (scheme (sys::url-pathname-scheme p))
    367          (authority (sys::url-pathname-authority p))
     366         (scheme (ext:url-pathname-scheme p))
     367         (authority (ext:url-pathname-authority p))
    368368         (host (if (search ":" authority)
    369369                   (subseq authority 0 (search ":" authority))
  • trunk/abcl/contrib/abcl-asdf/package.lisp

    r14921 r14922  
    1 (defpackage #:abcl-asdf
    2   (:use :cl)
     1(in-package :cl-user)
     2
     3(defpackage abcl-asdf
     4  (:use cl)
    35  (:export
    46;;; Public API
     
    3537   #:*inhibit-add-to-classpath*))
    3638
    37 (defpackage #:abcl-asdf-test
    38   (:use :cl :abcl-asdf)
    39   (:export #:run))
     39
     40
  • trunk/abcl/contrib/abcl-asdf/t/log4j.lisp

    r14921 r14922  
    1 (in-package :abcl-asdf-test)
     1(in-package :abcl-asdf/test)
    22
    3 (defun test-LOG4J.2 ()
     3(diag
    44  "Output a message to the Console.
    55
    6 Note:  for users of SLIME, this will appear in the associated *inferior-lisp* buffer."
    7   (#"configure" 'log4j.BasicConfigurator)
    8   (#"info" (#"getRootLogger" 'log4j.Logger) "Kilroy wuz here."))
     6Note:  for users of SLIME, this will appear in the associated *inferior-lisp* buffer.")
    97
    10 (rt:deftest LOG4j.2
    11     (test-LOG4J.2)
    12   t)
     8(plan 1)
     9
     10(ok
     11 (require :log4j)
     12 (#"configure" 'log4j.BasicConfigurator)
     13 (#"info" (#"getRootLogger" 'log4j.Logger) "Kilroy wuz here."))
     14
     15(finalize)
    1316
    1417
     
    1619
    1720
    18 
    19 
  • trunk/abcl/contrib/abcl-asdf/t/maven.lisp

    r14921 r14922  
    22(abcl-asdf:resolve-dependencies "log4j" "log4j")
    33
    4 (abcl-asdf:resolve-dependencies "org.armedbear.lisp" "abcl")
    54
    65|#
     6(in-package :abcl-asdf/test)
    77
    8 ; TODO figure out what sort of test framework we can hook in.  Probably ABCL-RT
     8(plan 4)
    99
    10 (in-package :abcl-asdf-test)
     10(ok
     11 (diag "Testing local bootable Maven version.")
     12 (diag (format nil
     13               "~{~&~a~}" (multiple-value-list (ensure-mvn-version)))))
    1114
    12 (rt:deftest LOG4J.1
    13     (let ((result (abcl-asdf:resolve-dependencies "log4j" "log4j")))
    14       (and result
    15            (format *standard-output* "~&~A~%" result)
    16            (type-p result 'cons)))
    17   t)
     15(ok
     16 (let ((result (abcl-asdf:resolve-dependencies "log4j" "log4j")))
     17   (and result
     18        (diag (format nil"~&~A~%" result))
     19        (type-p result 'cons))))
     20(ok
     21 (abcl-asdf:resolve "org.abcl/abcl"))
    1822
     23(ok
     24 (let ((result (abcl-asdf:resolve-dependencies "org.armedbear.lisp" "abcl")))
     25   (and result
     26        (format *standard-output* "~&~A~%" result)
     27        (type-p result 'cons))))
    1928
    20 (rt:deftest ABCL.1
    21   (let ((result (abcl-asdf:resolve-dependencies "org.armedbear.lisp" "abcl")))
    22     (and result
    23          (format *standard-output* "~&~A~%" result)
    24          (type-p result 'cons)))
    25   t)
     29(finalize)
    2630
    2731
  • trunk/abcl/contrib/mvn/log4j.asd

    r14921 r14922  
    11;;;; -*- Mode: LISP -*-
    22
    3 (asdf:defsystem :log4j 
     3(asdf:defsystem :log4j
    44  :defsystem-depends-on (abcl-asdf)
    5   :components ((:module log4j.jar :components
    6             ((:mvn "log4j/log4j/1.2.15")))
    7    (:module source :pathname "" :components
    8             ((:file "example"))
    9             :depends-on (log4j.jar))))
     5  :components ((:module log4j.jar
     6                        :components ((:mvn "log4j/log4j")))))
    107
    11 (defmethod perform ((o asdf:test-op) (s (eql (asdf:find-system :log4j))))
    12   (asdf:load-system :log4j)
    13   (eval (read-from-string "(cl-user::test-log4j.2)")))
     8
Note: See TracChangeset for help on using the changeset viewer.