Changeset 12338 for trunk/abcl/abcl.asd

Timestamp:

01/06/10 15:52:13 (12 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:

• trunk/abcl/abcl.asd (modified) (3 diffs)

trunk/abcl/abcl.asd

@@ -8 +8 @@
 
 ;;; Wrapper for all ABCL ASDF definitions.
-(defsystem :abcl :version "0.4.0")
+(defsystem :abcl :version "0.5.0")
 
 (defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
-  ;;; Additional test suite loads would go here.
-  (operate 'load-op :test-abcl :force t))
-
-(defmethod perform ((o test-op) (c (eql (find-system :abcl))))
-  ;;; Additional test suite invocations would go here.
-  (operate 'test-op :ansi-compiled :force t))
-
-;;; A collection of test suites for ABCL.
-(defsystem :test-abcl
-  :version "0.3.1"
-  :depends-on (:ansi-compiled #+nil :abcl-tests))
-
-(defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
+  (operate 'load-op :abcl-tests :force t)
+  (operate 'load-op :abcl-test-lisp :force t)
   (operate 'load-op :cl-bench :force t)
-  (operate 'load-op :abcl-test-lisp :force t)
   (operate 'load-op :ansi-compiled :force t)
   (operate 'load-op :ansi-interpreted :force t))
 
-#+nil
-(defmethod perform :before ((o load-op) (c t))
-  (warn "ASDF load-op class is ~A" c))
+;;;  Run via (asdf:operate 'asdf:test-op :abcl :force t)
+(defmethod perform ((o test-op) (c (eql (find-system :abcl))))
+  (operate 'test-op :abcl-tests :force t))
 
-(defsystem :ansi-test :version "1.0" :components
-     ;;; GCL ANSI test suite.
-     ((:module ansi-tests :pathname "test/lisp/ansi/" :components
-         ((:file "package")))))
+;;; A collection of test suites for ABCL.
+(defsystem :abcl-tests
+  :version "2.0"
+  :depends-on (:abcl-test-lisp 
+               :ansi-compiled :ansi-interpreted
+               :cl-bench))
 
-(defsystem :ansi-interpreted :version "1.0" :depends-on (ansi-test))
-(defmethod perform ((o test-op) (c (eql (find-system :ansi-interpreted))))
-   "Invoke tests with:  (asdf:oos 'asdf:test-op :ansi-interpreted :force t)."
-  (funcall (intern (symbol-name 'run) :abcl.test.ansi)
-     :compile-tests nil))
-(defmethod perform :before ((o test-op) (c (eql (find-system
-                                                 :ansi-interpreted))))
-  (operate 'load-op :ansi-interpreted :force t))
+(defmethod perfom :before ((o test-op (c (eql find-system :abcl-tests))))
+  (operate 'load-op :abcl-test-lisp)
+  (operate 'load-op :ansi-compiled)
+  (operate 'load-op :cl-bench))
 
-(defsystem :ansi-compiled :version "1.0" :depends-on (ansi-test))
-(defmethod perform ((o test-op) (c (eql (find-system :ansi-compiled))))
-  "Invoke tests with:  (asdf:oos 'asdf:test-op :abcl-compiled :force t)."
-  (funcall (intern (symbol-name 'run) :abcl.test.ansi)
-     :compile-tests t))
-(defmethod perform :before ((o test-op) (c (eql (find-system
-                                                 :ansi-compiled))))
-  (operate 'load-op :ansi-compiled :force t))
+;;;  Run via (asdf:operate 'asdf:test-op :abcl-tests :force t)
+(defmethod perform ((o test-op) (c (eql (find-system :abcl-tests))))
+  ;; Additional test suite invocations would go here.
+  (operate 'test-op :abcl-test-lisp) 
+  (operate 'test-op :ansi-compiled)
+  (operate 'test-op :cl-bench))
 
+;;; Test ABCL with the Lisp unit tests collected in "test/lisp/abcl"
 (defsystem :abcl-test-lisp :version "1.1" :components
      ((:module abcl-rt :pathname "test/lisp/abcl/" :serial t :components
@@ -62 +47 @@
          :pathname "test/lisp/abcl/" :components
          ((:file "package")))))
-
 (defmethod perform :before ((o test-op) (c (eql (find-system
                                                  :abcl-test-lisp))))
   (operate 'load-op :abcl-test-lisp :force t))
-
 (defmethod perform ((o test-op) (c (eql (find-system 'abcl-test-lisp))))
    "Invoke tests with (asdf:oos 'asdf:test-op :abcl-test-lisp)."
    (funcall (intern (symbol-name 'run) :abcl-test)))
 
+;;; Test ABCL with the interpreted ANSI tests
+(defsystem :ansi-interpreted :version "1.0.1" 
+           :components
+           ((:module ansi-tests :pathname "test/lisp/ansi/" :components
+         ((:file "package")))))
+(defmethod perform :before ((o test-op) (c (eql (find-system :ansi-interpreted))))
+  (operate 'load-op :ansi-interpreted))
+(defmethod perform ((o test-op) (c (eql (find-system :ansi-interpreted))))
+  (funcall (intern (symbol-name 'run) :abcl.test.ansi)
+     :compile-tests nil))
+
+;;; Test ABCL with the compiled ANSI tests
+(defsystem :ansi-compiled :version "1.0.1" 
+           :components
+           ((:module ansi-tests :pathname "test/lisp/ansi/" :components
+         ((:file "package")))))
+(defmethod perform :before ((o test-op) (c (eql (find-system :ansi-compiled))))
+  (operate 'load-op :ansi-compiled))
+(defmethod perform ((o test-op) (c (eql (find-system :ansi-compiled))))
+  (funcall (intern (symbol-name 'run) :abcl.test.ansi)
+     :compile-tests t))
+
+
+;;; Test ABCL with CL-BENCH 
 (defsystem :cl-bench :components
            ((:module cl-bench-package :pathname "../cl-bench/"
@@ -77 +84 @@
                      :depends-on (cl-bench-package) :components
                      ((:file "wrapper")))))
-
 (defmethod perform :before ((o test-op) (c (eql (find-system :cl-bench))))
   (operate 'load-op :cl-bench :force t))
-
 (defmethod perform ((o test-op) (c (eql (find-system :cl-bench))))
   (funcall (intern (symbol-name 'run) :abcl.test.cl-bench)))