0.8.12.40:

[sbcl.git] / contrib / sb-bsd-sockets / tests.lisp

diff --git a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp
index deb208f..5d15ab0 100644 (file)
--- 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,40 @@ Tests are in the file <tt>tests.lisp</tt> and also make good examples.
        (> (length data) 0))))
   t)
 
-#||
-<h2>Local-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
-||#
+;;; 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-local-client
-    (let ((s (make-instance 'local-socket :type :datagram)))
-      (format t "~A~%" s)
-      (socket-connect s "/dev/log")
-      (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
-       (format stream
-               "<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
+    (progn
+      ;; SunOS (Solaris) and Darwin systems don't have a socket at
+      ;; /dev/log.  We might also be building in a chroot or
+      ;; something, so don't fail this test just because the file is
+      ;; unavailable, or if it's a symlink to some weird character
+      ;; device.
+      (when (and (probe-file "/dev/log")
+                (sb-posix:s-issock
+                 (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))
+       (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 local-domain client code; this message can safely be ignored"))))
+      t)
+  t)
+
+
+;;; these require that the internet (or bits of it, at least) is available
 
 #+internet-available
 (deftest get-host-by-name