X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-posix%2Fsb-posix.asd;h=9963183e0378ab73266774e224439588796979ec;hb=HEAD;hp=ff9619e2396e3a453d8da99d468e15fb78f94e4c;hpb=c3fa52250b540c0b859fd3beb80cf147108f0fc6;p=sbcl.git

diff --git a/contrib/sb-posix/sb-posix.asd b/contrib/sb-posix/sb-posix.asd
index ff9619e..9963183 100644
--- a/contrib/sb-posix/sb-posix.asd
+++ b/contrib/sb-posix/sb-posix.asd
@@ -1,49 +1,39 @@
 ;;; -*-  Lisp -*-
-(cl:eval-when (:compile-toplevel :load-toplevel :execute)
-  (asdf:oos 'asdf:load-op :sb-grovel))
-(defpackage #:sb-posix-system (:use #:asdf #:cl #:sb-grovel))
-(in-package #:sb-posix-system)
-
 (defsystem sb-posix
-    :depends-on (sb-grovel)
-    #+sb-building-contrib :pathname
-    #+sb-building-contrib "SYS:CONTRIB;SB-POSIX;"
-    :components ((:file "defpackage")
-		 (:file "designator" :depends-on ("defpackage"))
-		 (:file "macros" :depends-on ("designator"))
-		 (sb-grovel:grovel-constants-file
-		  "constants"
-                  :do-not-grovel (progn #-sb-compiling-contribs t)
-		  :package :sb-posix :depends-on  ("defpackage"))
-		 (:file "interface" :depends-on ("constants" "macros" "designator"))))
-
-(defsystem sb-posix-tests
-    :depends-on (sb-rt)
-    :components ((:file "posix-tests")))
-
-(defmethod perform :after ((o load-op) (c (eql (find-system :sb-posix))))
-  (provide 'sb-posix))
-
-(defmethod perform ((o test-op) (c (eql (find-system :sb-posix))))
-  (operate 'load-op 'sb-posix-tests)
-  (operate 'test-op 'sb-posix-tests))
+  :defsystem-depends-on (sb-grovel)
+  #+sb-building-contrib :pathname
+  #+sb-building-contrib #p"SYS:CONTRIB;SB-POSIX;"
+  :components ((:file "defpackage")
+               (:file "designator" :depends-on ("defpackage"))
+               (:file "macros" :depends-on ("designator"))
+               (:sb-grovel-constants-file "constants"
+                :package :sb-posix :depends-on  ("defpackage"))
+               (:file "interface" :depends-on ("constants" "macros" "designator")))
+  :perform (load-op :after (o c) (provide 'sb-posix))
+  :perform (test-op (o c) (test-system 'sb-posix/tests)))
 
-(defmethod perform ((o test-op) (c (eql (find-system :sb-posix-tests))))
-  (funcall (intern "DO-TESTS" (find-package "SB-RT")))
-  (let ((failures (funcall (intern "PENDING-TESTS" "SB-RT")))
-	(ignored-failures (loop for sym being the symbols of :sb-posix-tests
-			        if (search ".ERROR" (symbol-name sym))
-			        collect sym)))
-    (cond
-      ((null failures)
-       t)
-      ((null (set-difference failures ignored-failures))
-       (warn "~@<some POSIX implementations return incorrect error values for ~
-              failing calls, but there is legitimate variation between ~
-              implementations too.  If you think the errno ~
-              from your platform is valid, please contact the sbcl ~
-              developers; otherwise, please submit a bug report to your ~
-              kernel distributor~@:>")
-       t)
-      (t
-       (error "non-errno tests failed!")))))
+(defsystem sb-posix/tests
+  :depends-on (sb-rt)
+  #+sb-building-contrib :pathname
+  #+sb-building-contrib #p"SYS:CONTRIB;SB-POSIX;"
+  :components ((:file "posix-tests"))
+  :perform
+  (test-op (o c)
+    (funcall (intern "DO-TESTS" (find-package "SB-RT")))
+    (let ((failures (funcall (intern "PENDING-TESTS" "SB-RT")))
+          (ignored-failures (loop for sym being the symbols of :sb-posix-tests
+                                  if (search ".ERROR" (symbol-name sym))
+                                    collect sym)))
+      (cond
+        ((null failures)
+         t)
+        ((null (set-difference failures ignored-failures))
+         (warn "~@<some POSIX implementations return incorrect error values for ~
+                failing calls, but there is legitimate variation between ~
+                implementations too.  If you think the errno ~
+                from your platform is valid, please contact the sbcl ~
+                developers; otherwise, please submit a bug report to your ~
+                kernel distributor~@:>")
+         t)
+        (t
+         (error "non-errno tests failed!"))))))