X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=base64.asd;h=f50650b7c27fcf3876a906113f62966e132fec91;hb=8b55e3d2a8f87eff537b7602c4ac0c447b5aca55;hp=a27bf2c444d7309c58803cc9240fbbd71a150a56;hpb=b129ff9b0dd34fa2a74029e4058807f9ef6edb9e;p=cl-base64.git

diff --git a/base64.asd b/base64.asd
index a27bf2c..f50650b 100644
--- a/base64.asd
+++ b/base64.asd
@@ -7,17 +7,15 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: base64.asd,v 1.8 2003/04/15 15:44:07 kevin Exp $
+;;;; $Id$
 ;;;; *************************************************************************
 
-(in-package :asdf)
+(in-package #:cl-user)
+(defpackage #:base64-system (:use #:asdf #:cl))
+(in-package #:base64-system)
 
-(cl:defpackage #:base64-system
-    (:use #:asdf #:cl))
-(cl:in-package #:base64-system)
 
-
-(defsystem :base64
+(defsystem base64
   :name "cl-base64"
   :author "Kevin M. Rosenberg based on initial code by Juri Pakaste"
   :version "3.1"
@@ -25,11 +23,8 @@
   :licence "BSD-style"
   :description "Base64 encoding and decoding with URI support."
   
-  :perform (load-op :after (op base64)
-	    (pushnew :base64 cl:*features*))
-
   ;; depends-on only needed for test-op
-  :depends-on (:kmrcl #-allegro :tester) 
+  :depends-on (:kmrcl) 
   
   :components
   ((:file "package")
@@ -37,6 +32,17 @@
    (:file "decode" :depends-on ("package"))
    ))
 
-(defmethod perform ((o test-op) (c (eql (find-system :base64))))
-  (or (load (compile-file "base64-tests.lisp"))
-         (error "test-op failed")))
+(defmethod perform ((o test-op) (c (eql (find-system 'base64))))
+  (operate 'load-op 'base64-tests)
+  (operate 'test-op 'base64-tests :force t))
+
+(defsystem base64-tests
+    :depends-on (base64 ptester)
+    :components
+    ((:file "tests")))
+
+(defmethod perform ((o test-op) (c (eql (find-system 'base64-tests))))
+  (operate 'load-op 'base64-tests)
+  (or (funcall (intern (symbol-name '#:do-tests)
+		       (find-package 'base64-test)))
+      (error "test-op failed")))