[armedbear-cvs] r12337 - in trunk/abcl: . test/lisp/cl-bench

[Mark Evenson]

Author: mevenson
Date: Tue Jan  5 17:27:13 2010
New Revision: 12337

Log:
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.




Modified:
   trunk/abcl/abcl.asd
   trunk/abcl/test/lisp/cl-bench/wrapper.lisp

Modified: trunk/abcl/abcl.asd
==============================================================================
--- trunk/abcl/abcl.asd	(original)
+++ trunk/abcl/abcl.asd	Tue Jan  5 17:27:13 2010
@@ -7,7 +7,7 @@
 (in-package :abcl-asdf)
 
 ;;; Wrapper for all ABCL ASDF definitions.
-(defsystem :abcl :version "0.3.1")
+(defsystem :abcl :version "0.4.0")
 
 (defmethod perform :after ((o load-op) (c (eql (find-system :abcl))))
   ;;; Additional test suite loads would go here.
@@ -71,8 +71,11 @@
    (funcall (intern (symbol-name 'run) :abcl-test)))
 
 (defsystem :cl-bench :components
-  ((:module cl-bench-wrapper :pathname "test/lisp/cl-bench/" :components 
-            ((:file "wrapper")))))
+           ((:module cl-bench-package :pathname "../cl-bench/"
+                    :components ((:file "defpackage")))
+            (:module cl-bench-wrapper :pathname "test/lisp/cl-bench/" 
+                     :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))

Modified: trunk/abcl/test/lisp/cl-bench/wrapper.lisp
==============================================================================
--- trunk/abcl/test/lisp/cl-bench/wrapper.lisp	(original)
+++ trunk/abcl/test/lisp/cl-bench/wrapper.lisp	Tue Jan  5 17:27:13 2010
@@ -12,12 +12,19 @@
   (merge-pathnames #p"../cl-bench/"
                    (component-pathname (find-system :abcl))))
 
+;;; cl-bench defines BENCH-GC and WITH-SPAWNED-THREAD in
+;;; '*cl-bench-directory*/sysdep/setup-ablisp.lisp'.  
+(defun cl-bench::bench-gc () (ext:gc))
+(defmacro cl-bench::with-spawned-thread (&body body)
+  `(progn , at body))
+
 (defun run ()
   (unless (probe-file *cl-bench-directory*)
-    (format t "Failed to find the cl-bench test suite in '~A'. ~
-Please manually download and extract the cl-bench tool suite from ~A to run the tests."
-            *cl-bench-directory*
-            *cl-bench-master-source-location*))
+    (error "Failed to find the cl-bench test suite in '~A'.~%
+Please manually download and extract the cl-bench tool suite~%
+from ~A to run the tests."
+           *cl-bench-directory*
+           *cl-bench-master-source-location*))
   (let ((*default-pathname-defaults* *cl-bench-directory*))
     (if (find :unix *features*)
         (run-shell-command