X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Ftests.lisp;h=a510c9f3ecb903a88cfb63ee7f0f5aa78ab7899f;hb=22c1de0a40df83bb5628974010a879cb2c17ff53;hp=40af6c25ee0366b7499df8d7fc1fe80e60fb2588;hpb=c8b71999fd488e73ea2c673e3c34245d45238f51;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp
index 40af6c2..a510c9f 100644
--- a/contrib/sb-bsd-sockets/tests.lisp
+++ b/contrib/sb-bsd-sockets/tests.lisp
@@ -1,5 +1,5 @@
 (defpackage "SB-BSD-SOCKETS-TEST"
-  (:use "CL" "SB-BSD-SOCKETS" "RT"))
+  (:use "CL" "SB-BSD-SOCKETS" "SB-RT"))
 
 #||
 
@@ -128,26 +128,32 @@ Tests are in the file <tt>tests.lisp</tt> and also make good examples.
 	(> (length data) 0))))
   t)
 
-#||
-<h2>Unix-domain sockets</h2>
-
-A fairly rudimentary test that connects to the syslog socket and sends a 
-message.  Priority 7 is kern.debug; you'll probably want to look at
-/etc/syslog.conf or local equivalent to find out where the message ended up
-||#
-
-(deftest simple-unix-client
-    (let ((s (make-instance 'unix-socket :type :datagram)))
-      (format t "~A~%" s)
-      (socket-connect s "/dev/log")
+;;; A fairly rudimentary test that connects to the syslog socket and
+;;; sends a message.  Priority 7 is kern.debug; you'll probably want
+;;; to look at /etc/syslog.conf or local equivalent to find out where
+;;; the message ended up
+
+#-sunos
+(deftest simple-local-client
+    (let ((s (make-instance 'local-socket :type :datagram)))
+      (format t "Connecting ~A... " s)
+      (finish-output)
+      (handler-case
+          (socket-connect s "/dev/log")
+        (sb-bsd-sockets::socket-error ()
+          (setq s (make-instance 'local-socket :type :stream))
+          (format t "failed~%Retrying with ~A... " s)
+          (finish-output)
+          (socket-connect s "/dev/log")))
+      (format t "ok.~%")
       (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
 	(format stream
-		"<7>bsd-sockets: Don't panic.  We're testing unix-domain client code; this message can safely be ignored")
+		"<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored")
 	t))
   t)
 
 
-;;; these require that the internet (or bits of it, atleast) is available
+;;; these require that the internet (or bits of it, at least) is available
 
 #+internet-available
 (deftest get-host-by-name