Changeset 12338 for trunk/abcl/abcl.asd


Ignore:
Timestamp:
01/06/10 15:52:13 (13 years ago)
Author:
Mark Evenson
Message:

Reworked test infrastructure.

Use ASDF to invoke all tests from Ant.

Add working test for Ant version at least 1.7.1.

Changed structure of 'build.xml' slightly to emphasize 'help' target
by placing it first.

Include cl-bench tests in 'abcl.test.lisp' Ant target.

Added 'help.test' target for help invoking tests.

abcl.asd now works for invoking tests. ASDF systems with empty
component specifications must be invoked with the :force t option to
execute correctly.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/abcl.asd

    r12337 r12338  
    88
    99;;; Wrapper for all ABCL ASDF definitions.
    10 (defsystem :abcl :version "0.4.0")
     10(defsystem :abcl :version "0.5.0")
    1111
    1212(defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
    13   ;;; Additional test suite loads would go here.
    14   (operate 'load-op :test-abcl :force t))
    15 
    16 (defmethod perform ((o test-op) (c (eql (find-system :abcl))))
    17   ;;; Additional test suite invocations would go here.
    18   (operate 'test-op :ansi-compiled :force t))
    19 
    20 ;;; A collection of test suites for ABCL.
    21 (defsystem :test-abcl
    22   :version "0.3.1"
    23   :depends-on (:ansi-compiled #+nil :abcl-tests))
    24 
    25 (defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
     13  (operate 'load-op :abcl-tests :force t)
     14  (operate 'load-op :abcl-test-lisp :force t)
    2615  (operate 'load-op :cl-bench :force t)
    27   (operate 'load-op :abcl-test-lisp :force t)
    2816  (operate 'load-op :ansi-compiled :force t)
    2917  (operate 'load-op :ansi-interpreted :force t))
    3018
    31 #+nil
    32 (defmethod perform :before ((o load-op) (c t))
    33   (warn "ASDF load-op class is ~A" c))
     19;;;  Run via (asdf:operate 'asdf:test-op :abcl :force t)
     20(defmethod perform ((o test-op) (c (eql (find-system :abcl))))
     21  (operate 'test-op :abcl-tests :force t))
    3422
    35 (defsystem :ansi-test :version "1.0" :components
    36      ;;; GCL ANSI test suite.
    37      ((:module ansi-tests :pathname "test/lisp/ansi/" :components
    38          ((:file "package")))))
     23;;; A collection of test suites for ABCL.
     24(defsystem :abcl-tests
     25  :version "2.0"
     26  :depends-on (:abcl-test-lisp
     27               :ansi-compiled :ansi-interpreted
     28               :cl-bench))
    3929
    40 (defsystem :ansi-interpreted :version "1.0" :depends-on (ansi-test))
    41 (defmethod perform ((o test-op) (c (eql (find-system :ansi-interpreted))))
    42    "Invoke tests with:  (asdf:oos 'asdf:test-op :ansi-interpreted :force t)."
    43   (funcall (intern (symbol-name 'run) :abcl.test.ansi)
    44      :compile-tests nil))
    45 (defmethod perform :before ((o test-op) (c (eql (find-system
    46                                                  :ansi-interpreted))))
    47   (operate 'load-op :ansi-interpreted :force t))
     30(defmethod perfom :before ((o test-op (c (eql find-system :abcl-tests))))
     31  (operate 'load-op :abcl-test-lisp)
     32  (operate 'load-op :ansi-compiled)
     33  (operate 'load-op :cl-bench))
    4834
    49 (defsystem :ansi-compiled :version "1.0" :depends-on (ansi-test))
    50 (defmethod perform ((o test-op) (c (eql (find-system :ansi-compiled))))
    51   "Invoke tests with:  (asdf:oos 'asdf:test-op :abcl-compiled :force t)."
    52   (funcall (intern (symbol-name 'run) :abcl.test.ansi)
    53      :compile-tests t))
    54 (defmethod perform :before ((o test-op) (c (eql (find-system
    55                                                  :ansi-compiled))))
    56   (operate 'load-op :ansi-compiled :force t))
     35;;;  Run via (asdf:operate 'asdf:test-op :abcl-tests :force t)
     36(defmethod perform ((o test-op) (c (eql (find-system :abcl-tests))))
     37  ;; Additional test suite invocations would go here.
     38  (operate 'test-op :abcl-test-lisp)
     39  (operate 'test-op :ansi-compiled)
     40  (operate 'test-op :cl-bench))
    5741
     42;;; Test ABCL with the Lisp unit tests collected in "test/lisp/abcl"
    5843(defsystem :abcl-test-lisp :version "1.1" :components
    5944     ((:module abcl-rt :pathname "test/lisp/abcl/" :serial t :components
     
    6247         :pathname "test/lisp/abcl/" :components
    6348         ((:file "package")))))
    64 
    6549(defmethod perform :before ((o test-op) (c (eql (find-system
    6650                                                 :abcl-test-lisp))))
    6751  (operate 'load-op :abcl-test-lisp :force t))
    68 
    6952(defmethod perform ((o test-op) (c (eql (find-system 'abcl-test-lisp))))
    7053   "Invoke tests with (asdf:oos 'asdf:test-op :abcl-test-lisp)."
    7154   (funcall (intern (symbol-name 'run) :abcl-test)))
    7255
     56;;; Test ABCL with the interpreted ANSI tests
     57(defsystem :ansi-interpreted :version "1.0.1"
     58           :components
     59           ((:module ansi-tests :pathname "test/lisp/ansi/" :components
     60         ((:file "package")))))
     61(defmethod perform :before ((o test-op) (c (eql (find-system :ansi-interpreted))))
     62  (operate 'load-op :ansi-interpreted))
     63(defmethod perform ((o test-op) (c (eql (find-system :ansi-interpreted))))
     64  (funcall (intern (symbol-name 'run) :abcl.test.ansi)
     65     :compile-tests nil))
     66
     67;;; Test ABCL with the compiled ANSI tests
     68(defsystem :ansi-compiled :version "1.0.1"
     69           :components
     70           ((:module ansi-tests :pathname "test/lisp/ansi/" :components
     71         ((:file "package")))))
     72(defmethod perform :before ((o test-op) (c (eql (find-system :ansi-compiled))))
     73  (operate 'load-op :ansi-compiled))
     74(defmethod perform ((o test-op) (c (eql (find-system :ansi-compiled))))
     75  (funcall (intern (symbol-name 'run) :abcl.test.ansi)
     76     :compile-tests t))
     77
     78
     79;;; Test ABCL with CL-BENCH
    7380(defsystem :cl-bench :components
    7481           ((:module cl-bench-package :pathname "../cl-bench/"
     
    7784                     :depends-on (cl-bench-package) :components
    7885                     ((:file "wrapper")))))
    79 
    8086(defmethod perform :before ((o test-op) (c (eql (find-system :cl-bench))))
    8187  (operate 'load-op :cl-bench :force t))
    82 
    8388(defmethod perform ((o test-op) (c (eql (find-system :cl-bench))))
    8489  (funcall (intern (symbol-name 'run) :abcl.test.cl-bench)))
Note: See TracChangeset for help on using the changeset viewer.