Permalink
Browse files

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
  • Loading branch information...
1 parent 2fc4945 commit 94862904357802272f86ef42f9d5deda519c8a89 @telent telent committed Nov 2, 2003
Showing with 21 additions and 17 deletions.
  1. +20 −16 contrib/sb-bsd-sockets/tests.lisp
  2. +1 −1 version.lisp-expr
@@ -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)
View
@@ -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"

0 comments on commit 9486290

Please sign in to comment.