X-Git-Url: http://git.kpe.io/?p=puri.git;a=blobdiff_plain;f=puri.asd;h=0e4ea9c52f9de44dd7f2b414e2629d4c5eea2800;hp=193f98db936a5ed6a78a171ec42b8645fa74c329;hb=HEAD;hpb=55f0e1f9f5e0d485daa152c164d38d8f2cceb45e

diff --git a/puri.asd b/puri.asd
index 193f98d..eda4faf 100644
--- a/puri.asd
+++ b/puri.asd
@@ -6,24 +6,20 @@
 (defpackage #:puri-system (:use #:cl #:asdf))
 (in-package #:puri-system)
 
-
 (defsystem puri
   :name "cl-puri"
   :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
   :licence "GNU Lesser General Public License"
   :description "Portable Universal Resource Indentifier Library"
   :components
-  ((:file "src")))
-
-(defmethod perform ((o test-op) (c (eql (find-system 'puri))))
-  (oos 'load-op 'puri-tests)
-  (oos 'test-op 'puri-tests))
+  ((:file "src"))
+  :in-order-to ((test-op (test-op "puri/test"))))
 
-(defsystem puri-tests
-    :depends-on (:puri :tester) 
+(defsystem puri/test
+    :depends-on (:ptester :puri)
     :components
-    ((:file "tests")))
-
-(defmethod perform ((o test-op) (c (eql (find-system 'puri-tests))))
-  (or (funcall (intern (symbol-name '#:do-tests) (find-package :rt)))
-      (error "test-op failed")))
+    ((:file "tests"))
+    :perform (test-op (o s)
+                      (or (funcall (intern (symbol-name '#:do-tests)
+		                           (find-package '#:puri/test)))
+                          (error "test-op failed"))))