From: sa2c <sa2c>
Date: Thu, 8 Mar 2007 11:12:21 +0000 (+0000)
Subject: 1.0.3.36: Don't fail on timeout on contrib/sb-simple-streams tests.
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=bb00c71ace38129b5870c8fe05f70a79b3c6f087;p=sbcl.git

1.0.3.36: Don't fail on timeout on contrib/sb-simple-streams tests.

Timeout may occur on the restricted systems (e.g. FreeBSD with
jail(8) or blackhole(4) is used) when connecting to even localhost.
---

diff --git a/contrib/sb-simple-streams/simple-stream-tests.lisp b/contrib/sb-simple-streams/simple-stream-tests.lisp
index 557fb63..1a31992 100644
--- a/contrib/sb-simple-streams/simple-stream-tests.lisp
+++ b/contrib/sb-simple-streams/simple-stream-tests.lisp
@@ -124,7 +124,10 @@
         (string= (prog1 (write-line "Got it!" s) (finish-output s))
                  (read-line s)))
     ;; Fail gracefully if echo isn't activated on the system
-    (sb-bsd-sockets::connection-refused-error () t))
+    (sb-bsd-sockets::connection-refused-error () t)
+    ;; Timeout may occur on the restricted systems (e.g. FreeBSD
+    ;; with jail(8) or blackhole(4) is used).
+    (sb-bsd-sockets::operation-timeout-error () t))
   t)
 
 (deftest write-read-large-sc-1
@@ -197,7 +200,10 @@
        (string= (prog1 (write-line content s) (finish-output s))
                 (read-line s))))
     ;; Fail gracefully if echo isn't activated on the system
-   (sb-bsd-sockets::connection-refused-error () t))
+   (sb-bsd-sockets::connection-refused-error () t)
+   ;; Timeout may occur on the restricted systems (e.g. FreeBSD
+   ;; with jail(8) or blackhole(4) is used).
+   (sb-bsd-sockets::operation-timeout-error () t))
   t)
 
 
diff --git a/version.lisp-expr b/version.lisp-expr
index 9969a86..dca2735 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.3.35"
+"1.0.3.36"