[armedbear-cvs] r13808 - in trunk/abcl/contrib/abcl-asdf: . tests

[mevenson at common-lisp.net]

Author: mevenson
Date: Wed Jan 25 05:57:43 2012
New Revision: 13808

Log:
abcl-asdf: remove all the broken test framework references.

The system defintion ABCL-ASDF-TEST now loads again.  Use
ABCL-ASDF-TEST:RUN as the executable symbol for manual tests.

Modified:
   trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd
   trunk/abcl/contrib/abcl-asdf/packages.lisp
   trunk/abcl/contrib/abcl-asdf/tests/example.lisp
   trunk/abcl/contrib/abcl-asdf/tests/maven.lisp

Modified: trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd	Wed Jan 25 05:34:03 2012	(r13807)
+++ trunk/abcl/contrib/abcl-asdf/abcl-asdf.asd	Wed Jan 25 05:57:43 2012	(r13808)
@@ -20,17 +20,26 @@
 
 (defsystem :abcl-asdf-test
   :author "Mark Evenson"
-  :depends-on (abcl)
+  :depends-on (abcl-asdf)
   :components
-  ((:module tests :components
-            (#+nil (:file "example")
-                   (:file "maven")))))
+  ((:module tests :serial t :components
+            ((:file "example")
+             (:file "maven")
+             (:file "test")))))
 
-#+nil FIXME
+#|
+(defmethod perform ((o test-op) (c (eql (find-system 'abcl-asdf-test))))
+  (funcall (intern (symbol-name 'run) 'abcl-asdf-test)))
+
+(defmethod perform ((o test-op) (c (eql (find-system 'abcl-asdf))))
+  (asdf:load-system :abcl-asdf-test))
+  (asdf:test-system :abcl-asdf-test))
+
+ ;;; FIXME
 (defmethod perform ((o test-op) (c (eql (find-system 'abcl-asdf))))
    "Invoke tests with (asdf:test-system 'abcl-asdf)."
    (asdf:load-system 'abcl)
    (asdf:load-system 'abcl-test-lisp)
    (asdf:load-system 'abcl-asdf-test)
    (funcall (intern (symbol-name 'run) 'abcl-asdf-test)))
-
+|#

Modified: trunk/abcl/contrib/abcl-asdf/packages.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/packages.lisp	Wed Jan 25 05:34:03 2012	(r13807)
+++ trunk/abcl/contrib/abcl-asdf/packages.lisp	Wed Jan 25 05:57:43 2012	(r13808)
@@ -27,5 +27,5 @@
    #:*inhibit-add-to-classpath*))
 
 (defpackage #:abcl-asdf-test
-  (:use :cl #+nil :abcl-test-lisp) ;;; FIXME
+  (:use :cl #+nil :abcl-test-lisp) ;;; FIXME include some sort of test framework
   (:export #:run))

Modified: trunk/abcl/contrib/abcl-asdf/tests/example.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/tests/example.lisp	Wed Jan 25 05:34:03 2012	(r13807)
+++ trunk/abcl/contrib/abcl-asdf/tests/example.lisp	Wed Jan 25 05:57:43 2012	(r13808)
@@ -1,11 +1,12 @@
 (in-package :abcl-asdf-test)
 
-(deftest LOG4J.2
-    (progn
-      (asdf:load-system "log4j")
-      (let ((logger (#"getLogger" 'log4j.Logger (symbol-name (gensym)))))
-        (#"trace" logger "Kilroy wuz here.")))
-  t)
+;;;(deftest LOG4J.2
+;;;    (progn
+(defun test-LOG4J.2 ()
+  (asdf:load-system "log4j")
+  (let ((logger (#"getLogger" 'log4j.Logger (symbol-name (gensym)))))
+    (#"trace" logger "Kilroy wuz here.")))
+;;;  t)
 
 
 

Modified: trunk/abcl/contrib/abcl-asdf/tests/maven.lisp
==============================================================================
--- trunk/abcl/contrib/abcl-asdf/tests/maven.lisp	Wed Jan 25 05:34:03 2012	(r13807)
+++ trunk/abcl/contrib/abcl-asdf/tests/maven.lisp	Wed Jan 25 05:57:43 2012	(r13808)
@@ -9,20 +9,22 @@
 
 (in-package :abcl-asdf-test)
 
-(deftest LOG4J.1
+;;;;(deftest LOG4J.1
+(defun test-LOG4J.1 ()
     (let ((result (abcl-asdf:resolve-dependencies "log4j" "log4j")))
       (and result
            (format *standard-output* "~&~A~%" result)
-           (type-p result 'cons)))
-  t)
+           (type-p result 'cons))))
+;;;  t)
 
 
-(deftest ABCL.1
+;;;;(deftest ABCL.1
+(defun test-ABCL.1 ()
     (let ((result (abcl-asdf:resolve-dependencies "org.armedbear.lisp" "abcl")))
       (and result
            (format *standard-output* "~&~A~%" result)
-           (type-p result 'cons)))
-  t)
+           (type-p result 'cons))))
+;;;  t)