X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=cl-graph-test.asd;h=83c980cdad9c1474f708f3a9b50c77d55a02a1f2;hb=826f2a63e055107f19d090c3f73320fa1d6a91cf;hp=70ca5379f8135c7cea871c533b5d687b5b4d261f;hpb=b9b77eaf8b04ffe94412d5ff49cacae2d19ebb65;p=cl-graph.git

diff --git a/cl-graph-test.asd b/cl-graph-test.asd
index 70ca537..83c980c 100644
--- a/cl-graph-test.asd
+++ b/cl-graph-test.asd
@@ -1,48 +1,44 @@
-;;; -*- Mode: Lisp; package: CL-USER; Syntax: Common-lisp; Base: 10 -*-
-
-#|
-
-|#
+;;; -*- Mode: Lisp; package: cl-user; Syntax: Common-lisp; Base: 10 -*-
 
 (in-package :common-lisp-user)
-(defpackage #:asdf-cl-graph-test (:use #:cl #:asdf))
-(in-package #:asdf-cl-graph-test)
+(defpackage #:cl-graph-test-system (:use #:cl #:asdf))
+(in-package #:cl-graph-test-system)
 
 (defsystem cl-graph-test
-  :version "0.1"
   :author "Gary Warren King <gwking@metabang.com>"
   :maintainer "Gary Warren King <gwking@metabang.com>"
   :licence "MIT Style License"
   :description "Tests for CL-Graph"
-
-  :components ((:module "unit-tests"
-                        :components ((:file "package")
-                                     (:file "test-graph" :depends-on ("package"))
-                                     (:file "test-graph-container" :depends-on ("test-graph"))
-                                     (:file "test-connected-components" :depends-on ("test-graph"))
-                                     (:file "test-graph-metrics" :depends-on ("test-graph"))
-                                     (:file "test-graph-algorithms" :depends-on ("test-graph"))
-                                     ))
+  :components ((:module
+		"setup"
+		:pathname "unit-tests/"
+		:components
+		((:file "package")
+		 (:file "test-graph" :depends-on ("package"))
+		 ))
+	       (:module 
+		"unit-tests"
+		:pathname "unit-tests/"
+		:depends-on ("setup")
+		:components
+		((:file "test-graph-container")
+		 (:file "test-connected-components")
+		 ;;(:file "test-graph-algorithms")
+		 (:file "test-api")
+		 ))
                
-               (:module "dev"
-                        :components ((:static-file "notes.text"))))
-  
-  :in-order-to ((test-op (load-op cl-graph-test)))
-  :depends-on (cl-graph lift))
-
-;;; ---------------------------------------------------------------------------
-
-(defmethod perform :after ((op test-op ) (c (eql (find-system 'cl-graph-test))))
-  (describe
-   (funcall 
-    (intern (symbol-name '#:run-tests) '#:lift) 
-    :suite (intern (symbol-name '#:cl-graph-test) '#:cl-graph-test))))
-
-;;; ---------------------------------------------------------------------------
-
-(defmethod perform :after ((o load-op) (c (eql (find-system 'cl-graph-test))))
-  )
-
-(defmethod operation-done-p ((o test-op) (c (eql (find-system 'cl-graph-test))))
-  ;; testing is never done...
-  (values nil))
+               (:module 
+		"dev"
+		:components
+		((:static-file "notes.text"))))
+  :depends-on (:cl-graph :lift))
+
+;; 2008-09-24 - I don't know if this will work or not 
+;; i.e., will it happen at the right time wrt everything else
+#+asdf-system-connections
+(asdf:defsystem-connection cl-graph-test-and-cl-mathstats
+  :requires (cl-graph moptilities)
+  :components ((:module 
+		"unit-tests"
+		:components
+		((:file "test-graph-metrics")))))