From: Daniel Barlow <dan@telent.net>
Date: Sun, 2 Nov 2003 00:36:07 +0000 (+0000)
Subject: 0.8.5.18
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=94862904357802272f86ef42f9d5deda519c8a89;p=sbcl.git

0.8.5.18
	Minor change to sb-bsd-sockets tests: instead of
	conditionalising the AF_LOCAL client test on (not (or sunos
	darwin)), just skip it unless /dev/log exists.  This make life
	simpler if we're e.g. on a platform that usually has /dev/log
---

diff --git a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp
index 6a7931e..dc59b94 100644
--- a/contrib/sb-bsd-sockets/tests.lisp
+++ b/contrib/sb-bsd-sockets/tests.lisp
@@ -133,23 +133,27 @@ Tests are in the file <tt>tests.lisp</tt> and also make good examples.
 ;;; to look at /etc/syslog.conf or local equivalent to find out where
 ;;; the message ended up
 
-#-(or sunos darwin)
 (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 local-domain client code; this message can safely be ignored")
-	t))
+    (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
+      (when (probe-file "/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)
 
 
diff --git a/version.lisp-expr b/version.lisp-expr
index 8a1ecba..9378f24 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.5.17"
+"0.8.5.18"