X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-simple-streams%2Fsb-simple-streams.asd;fp=contrib%2Fsb-simple-streams%2Fsb-simple-streams.asd;h=a69e08556d5818b5bd9796c46c706ff940c0ed52;hb=25c1769e30ff7404b52a9be663626d87f8ff75bc;hp=3e103db33217ec8f87a1d2d0cecd680561fb5bd2;hpb=9c3a9502bc872f024c365412d991ef43fd866e4c;p=sbcl.git

diff --git a/contrib/sb-simple-streams/sb-simple-streams.asd b/contrib/sb-simple-streams/sb-simple-streams.asd
index 3e103db..a69e085 100644
--- a/contrib/sb-simple-streams/sb-simple-streams.asd
+++ b/contrib/sb-simple-streams/sb-simple-streams.asd
@@ -1,9 +1,5 @@
 ;;; -*- lisp -*-
 
-(defpackage #:sb-simple-stream-system (:use #:asdf #:cl))
-(in-package #:sb-simple-stream-system)
-
-
 (defsystem sb-simple-streams
   :depends-on (sb-bsd-sockets sb-posix)
   #+sb-building-contrib :pathname
@@ -24,22 +20,12 @@
                (:file "string" :depends-on ("strategy"))
                (:file "terminal" :depends-on ("strategy"))
                ;;(:file "gray-compat" :depends-on ("package"))
-               ))
-
-(defmethod perform :after ((o load-op)
-                           (c (eql (find-system :sb-simple-streams))))
-  (provide 'sb-simple-streams))
-
-(defmethod perform ((o test-op) (c (eql (find-system :sb-simple-streams))))
-  (operate 'load-op 'sb-simple-streams-tests)
-  (operate 'test-op 'sb-simple-streams-tests))
+               )
+  :perform (load-op :after (o c) (provide 'sb-simple-streams))
+  :perform (test-op (o c) (test-system 'sb-simple-streams/tests)))
 
-
-(defsystem sb-simple-streams-tests
+(defsystem sb-simple-streams/tests
   :depends-on (sb-rt sb-simple-streams)
+  #+sb-building-contrib :pathname
+  #+sb-building-contrib #p"SYS:CONTRIB;SB-SIMPLE-STREAMS;"
   :components ((:file "simple-stream-tests")))
-
-(defmethod perform ((o test-op)
-                    (c (eql (find-system :sb-simple-streams-tests))))
-  (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
-      (error "test-op failed")))