Changeset 12337


Ignore:
Timestamp:
01/05/10 22:27:13 (12 years ago)
Author:
Mark Evenson
Message:

cl-bench now runs correctly from UNIX systems.

Increment the abcl.asd version to note the inclusion of cl-bench.

The absence of the cl-build source is not as well reported, but we now
load the cl-bench/defpackage code to define the cl-bench packages as
part of the ASDF step.

Location:
trunk/abcl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/abcl.asd

    r12335 r12337  
    88
    99;;; Wrapper for all ABCL ASDF definitions.
    10 (defsystem :abcl :version "0.3.1")
     10(defsystem :abcl :version "0.4.0")
    1111
    1212(defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
     
    7272
    7373(defsystem :cl-bench :components
    74   ((:module cl-bench-wrapper :pathname "test/lisp/cl-bench/" :components
    75             ((:file "wrapper")))))
     74           ((:module cl-bench-package :pathname "../cl-bench/"
     75                    :components ((:file "defpackage")))
     76            (:module cl-bench-wrapper :pathname "test/lisp/cl-bench/"
     77                     :depends-on (cl-bench-package) :components
     78                     ((:file "wrapper")))))
    7679
    7780(defmethod perform :before ((o test-op) (c (eql (find-system :cl-bench))))
  • trunk/abcl/test/lisp/cl-bench/wrapper.lisp

    r12335 r12337  
    1313                   (component-pathname (find-system :abcl))))
    1414
     15;;; cl-bench defines BENCH-GC and WITH-SPAWNED-THREAD in
     16;;; '*cl-bench-directory*/sysdep/setup-ablisp.lisp'. 
     17(defun cl-bench::bench-gc () (ext:gc))
     18(defmacro cl-bench::with-spawned-thread (&body body)
     19  `(progn ,@body))
     20
    1521(defun run ()
    1622  (unless (probe-file *cl-bench-directory*)
    17     (format t "Failed to find the cl-bench test suite in '~A'. ~
    18 Please manually download and extract the cl-bench tool suite from ~A to run the tests."
    19             *cl-bench-directory*
    20             *cl-bench-master-source-location*))
     23    (error "Failed to find the cl-bench test suite in '~A'.~%
     24Please manually download and extract the cl-bench tool suite~%
     25from ~A to run the tests."
     26           *cl-bench-directory*
     27           *cl-bench-master-source-location*))
    2128  (let ((*default-pathname-defaults* *cl-bench-directory*))
    2229    (if (find :unix *features*)
Note: See TracChangeset for help on using the changeset viewer.