Changeset 12301


Ignore:
Timestamp:
12/22/09 16:07:07 (11 years ago)
Author:
Mark Evenson
Message:

Loading ABCL tests improved; renamed loading jar-file tests.

ASDF loading of ABCL-TEST-LISP improved to not need :FORCE argument.

JAR-FILE tests included as part of ABCL-TEST-LISP.

Location:
trunk/abcl
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/abcl/abcl.asd

    r12300 r12301  
    88
    99;;; Wrapper for all ABCL ASDF definitions.
    10 (defsystem :abcl :version "0.3.0")
     10(defsystem :abcl :version "0.3.1")
    1111
    1212(defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
     
    2020;;; A collection of test suites for ABCL.
    2121(defsystem :test-abcl
    22   :version "0.3"
     22  :version "0.3.1"
    2323  :depends-on (:ansi-compiled #+nil :abcl-tests))
    2424
    25 (defmethod perform :after ((o load-op) (c (eql (find-system :test-abcl))))
     25(defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
    2626  #+nil (asdf:oos 'asdf:test-op :cl-bench :force t)
    2727  (operate 'load-op :abcl-test-lisp :force t)
    2828  (operate 'load-op :ansi-compiled :force t)
    2929  (operate 'load-op :ansi-interpreted :force t))
     30
     31(defmethod perform :before ((o load-op) (c t))
     32  (warn "ASDF load-op class is ~A" c))
    3033
    3134(defsystem :ansi-test :version "1.0" :components
     
    3740(defmethod perform ((o test-op) (c (eql (find-system :ansi-interpreted))))
    3841   "Invoke tests with:  (asdf:oos 'asdf:test-op :ansi-interpreted :force t)."
    39    ;;; FIXME needs ASDF:OOS to be invoked with :FORCE t
    4042  (funcall (intern (symbol-name 'run) :abcl.test.ansi)
    4143     :compile-tests nil))
     44(defmethod perform :before ((o test-op) (c (eql (find-system
     45                                                 :ansi-interpreted))))
     46  (operate 'load-op :ansi-interpreted :force t))
    4247
    4348(defsystem :ansi-compiled :version "1.0" :depends-on (ansi-test))
     
    4651  (funcall (intern (symbol-name 'run) :abcl.test.ansi)
    4752     :compile-tests t))
     53(defmethod perform :before ((o test-op) (c (eql (find-system
     54                                                 :ansi-compiled))))
     55  (operate 'load-op :ansi-compiled :force t))
    4856
    49 (defsystem :abcl-test-lisp :version "1.0" :components
     57(defsystem :abcl-test-lisp :version "1.1" :components
    5058     ((:module abcl-rt :pathname "test/lisp/abcl/" :serial t :components
    5159         ((:file "rt-package") (:file "rt")))
     
    5462         ((:file "package")))))
    5563
     64(defmethod perform :before ((o test-op) (c (eql (find-system
     65                                                 :abcl-test-lisp))))
     66  (operate 'load-op :abcl-test-lisp :force t))
     67
    5668(defmethod perform ((o test-op) (c (eql (find-system 'abcl-test-lisp))))
    57    "Invoke tests with:  (asdf:oos 'asdf:test-op :abcl-test-lisp :force t)."
    58    ;;; FIXME needs ASDF:OOS to be invoked with :FORCE t
    59    (funcall (intern (symbol-name 'run) :abcl.test.lisp)))
     69   "Invoke tests with (asdf:oos 'asdf:test-op :abcl-test-lisp)."
     70   (funcall (intern (symbol-name 'run) :abcl-test)))
    6071 
    6172;;; Build ABCL from a Lisp.
  • trunk/abcl/test/lisp/abcl/jar-file.lisp

    r12300 r12301  
    66  (let* ((*default-pathname-defaults* *this-directory*)
    77         (asdf::*verbose-out* *standard-output*)
    8          (package-command (format nil "sh ~A" (merge-pathnames "package-load.sh"))))
     8         (package-command (format nil "cd ~A; sh ~A"
     9                                  *this-directory*
     10                                  (merge-pathnames "package-load.sh"))))
    911    (compile-file "foo.lisp")
    1012    (compile-file "bar.lisp")
    1113    (compile-file "eek.lisp")
    12     (asdf:run-shell-command package-command)))
     14    (asdf:run-shell-command package-command))
     15  (setf *jar-file-init* t))
    1316
    14 (load-init)
     17(defvar *jar-file-init* nil)
    1518
    16 (deftest load.1
    17     (let ((*default-pathname-defaults* *this-directory*))
    18       (load "foo"))
     19
     20(defmacro with-jar-file-init (&rest body)
     21  `(let ((*default-pathname-defaults* *this-directory*))
     22     (progn
     23       (unless *jar-file-init*
     24         (load-init))
     25       ,@body)))
     26 
     27
     28(deftest jar-file-load.1
     29    (with-jar-file-init
     30        (load "foo"))
    1931  t)
    2032
    21 (deftest load.2
    22     (let ((*default-pathname-defaults* *this-directory*))
     33(deftest jar-file-load.2
     34    (with-jar-file-init
    2335      (load "foo.lisp"))
    2436  t)
    2537
    26 (deftest load.3
    27     (let ((*default-pathname-defaults* *this-directory*))
     38(deftest jar-file-load.3
     39    (with-jar-file-init
    2840      (load "foo.abcl"))
    2941  t)
    3042
    31 (deftest load.4
    32     (let ((*default-pathname-defaults* *this-directory*))
     43(deftest jar-file-load.4
     44    (with-jar-file-init
    3345      (load "jar:file:baz.jar!/foo"))
    3446  t)
    3547
    36 (deftest load.6
    37     (let ((*default-pathname-defaults* *this-directory*))
     48(deftest jar-file-load.6
     49    (with-jar-file-init
    3850      (load "jar:file:baz.jar!/bar"))
    3951  t)
    4052
    41 (deftest load.7
    42     (let ((*default-pathname-defaults* *this-directory*))
     53(deftest jar-file-load.7
     54    (with-jar-file-init
    4355      (load "jar:file:baz.jar!/bar.abcl"))
    4456  t)
    4557
    46 (deftest load.8
    47     (let ((*default-pathname-defaults* *this-directory*))
     58(deftest jar-file-load.8
     59    (with-jar-file-init
    4860      (load "jar:file:baz.jar!/eek"))
    4961  t)
    5062
    51 (deftest load.9
    52     (let ((*default-pathname-defaults* *this-directory*))
     63(deftest jar-file-load.9
     64    (with-jar-file-init
    5365      (load "jar:file:baz.jar!/eek.lisp"))
    5466  t)
     67
     68
     69(deftest jar-file-probe-file.1
     70    (with-jar-file-init
     71        (probe-file "jar:file:baz.jar!/eek.lisp"))
     72  #p"jar:file:baz.jar!/eek.lisp")
     73
     74
     75(deftest jar-file-merge-pathnames.1
     76    (merge-pathnames
     77     "!/foo" #p"jar:file:baz.jar")
     78  #p"jar:file:baz.jar!/foo")
    5579
    5680
  • trunk/abcl/test/lisp/abcl/package.lisp

    r12141 r12301  
    2424    (load "misc-tests.lisp")
    2525
     26    (when (find :unix *features*)
     27      (load "jar-file.lisp"))
     28
    2629    (do-tests)))
    2730
Note: See TracChangeset for help on using the changeset viewer.