From 6f2eb1cff34a7372a82f4b0b1bef3b35809a2a7d Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Mon, 30 Apr 2007 21:01:42 +0000 Subject: [PATCH] 1.0.5.15: fix SB-BSD-SOCKETS tests on chrooted NetBSD * Handle dangling /dev/log symlink * Patch by Richard Kreuter --- contrib/sb-bsd-sockets/tests.lisp | 10 +++++++--- version.lisp-expr | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp index 420c123..66f8707 100644 --- a/contrib/sb-bsd-sockets/tests.lisp +++ b/contrib/sb-bsd-sockets/tests.lisp @@ -162,9 +162,13 @@ ;; 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")))) + (when (block nil + (handler-bind ((sb-posix:syscall-error + (lambda (e) + (declare (ignore e)) + (return nil)))) + (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) diff --git a/version.lisp-expr b/version.lisp-expr index 5105df6..57e57ee 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".) -"1.0.5.14" +"1.0.5.15" -- 1.7.10.4