X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fsb-bsd-sockets.asd;h=e17fc63beaf27b140ad4f95a9c12653cf1d81ee9;hb=bcd323c39d6f5f80020ba4a5d9eb8d348c6cc499;hp=b818457df97c1a6fd5abb943fb2017ae674a60a9;hpb=c03ebb54770cfa613d4b706a80e5be231786a5d0;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
index b818457..e17fc63 100644
--- a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
+++ b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
@@ -1,53 +1,72 @@
 ;;; -*-  Lisp -*-
-#-win32 (eval-when (:compile-toplevel :load-toplevel :execute)
+(eval-when (:compile-toplevel :load-toplevel :execute)
           (require :sb-grovel))
-(defpackage #:sb-bsd-sockets-system (:use #:asdf #-win32 #:sb-grovel #:cl))
+(defpackage #:sb-bsd-sockets-system (:use #:asdf #:sb-grovel #:cl))
 (in-package #:sb-bsd-sockets-system)
 
 (defsystem sb-bsd-sockets
     :version "0.58"
-    :depends-on #-win32 (sb-grovel) #+win32 ()
+    :depends-on (sb-grovel)
     #+sb-building-contrib :pathname
-    #+sb-building-contrib "SYS:CONTRIB;SB-BSD-SOCKETS;"
+    #+sb-building-contrib #p"SYS:CONTRIB;SB-BSD-SOCKETS;"
     :components ((:file "defpackage")
-                 #+win32 (:file "win32-constants" :depends-on ("defpackage"))
-                 #+win32 (:file "win32-sockets" :depends-on ("win32-constants"))
-		 (:file "split" :depends-on ("defpackage"))
-		 (:file "malloc" :depends-on ("defpackage"))
-		 #-win32 (sb-grovel:grovel-constants-file
-		  "constants"
-		  :package :sockint
-		  :depends-on  ("defpackage"))
-		 (:file "sockets"
-                        :depends-on #-win32 ("constants") 
+                 (:file "split" :depends-on ("defpackage"))
+                 #+win32
+                 (:file "win32-lib")
+                 #-win32 (sb-grovel:grovel-constants-file
+                          "constants"
+                          :package :sockint
+                          :do-not-grovel #.(progn #-sb-building-contrib t)
+                          :depends-on  ("defpackage"))
+                 #+win32 (sb-grovel:grovel-constants-file
+                          "win32-constants"
+                          :package :sockint
+                          :do-not-grovel #.(progn #-sb-building-contrib t)
+                          :depends-on  ("defpackage" "win32-lib"))
+                 #+win32 (:file "win32-sockets"
+                                :depends-on ("win32-constants"))
+                 (:file "sockets"
+                        :depends-on #-win32 ("constants")
                                     #+win32 ("win32-sockets"))
-		 (:file "sockopt" :depends-on ("sockets"))
+                 (:file "sockopt" :depends-on ("sockets"))
                  (:file "inet" :depends-on ("sockets" "split"))
                  (:file "local" :depends-on ("sockets" "split"))
-                 (:file "name-service" :depends-on ("sockets" #-win32 "constants"))
+                 (:file "name-service" :depends-on ("sockets"))
                  (:file "misc" :depends-on ("sockets"))
 
-		 (:static-file "NEWS")
-		 ;; (:static-file "INSTALL")
-		 ;; (:static-file "README")
-		 ;; (:static-file "index" :pathname "index.html")
-		 (:static-file "doc" :pathname "doc.lisp")
-		 (:static-file "TODO")))
+                 (:static-file "NEWS")
+                 ;; (:static-file "INSTALL")
+                 ;; (:static-file "README")
+                 ;; (:static-file "index" :pathname "index.html")
+                 (:static-file "TODO")))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system :sb-bsd-sockets))))
   (provide 'sb-bsd-sockets))
 
-#-win32
 (defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets))))
   (operate 'load-op 'sb-bsd-sockets-tests)
   (operate 'test-op 'sb-bsd-sockets-tests))
 
-#-win32
 (defsystem sb-bsd-sockets-tests
   :depends-on (sb-rt sb-bsd-sockets #-win32 sb-posix)
   :components ((:file "tests")))
 
-#-win32
 (defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets-tests))))
-  (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
-      (error "test-op failed")))
+  (multiple-value-bind (soft strict pending)
+      (funcall (intern "DO-TESTS" (find-package "SB-RT")))
+    (declare (ignorable pending))
+    (fresh-line)
+    (unless strict
+      #+sb-testing-contrib
+      ;; We create TEST-PASSED from a shell script if tests passed.  But
+      ;; since the shell script only `touch'es it, we can actually create
+      ;; it ahead of time -- as long as we're certain that tests truly
+      ;; passed, hence the check for SOFT.
+      (when soft
+        (with-open-file (s #p"SYS:CONTRIB;SB-BSD-SOCKETS;TEST-PASSED"
+                           :direction :output)
+          (dolist (pend pending)
+            (format s "Expected failure: ~A~%" pend))))
+      (warn "ignoring expected failures in test-op"))
+    (unless soft
+      (error "test-op failed with unexpected failures"))))