X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-concurrency%2Ftests%2Ftest-utils.lisp;h=bc21ebc5f8949f72b0e56dd0f7810c9713f42885;hb=f066ad2b0b89c016ab9ceaac6de0758e4eb4c1fb;hp=6a5e82a939a8ec425b78fa4657f0949a142951f0;hpb=ea0735f0b8bab352d6c9797abec19e8c63563cf6;p=sbcl.git

diff --git a/contrib/sb-concurrency/tests/test-utils.lisp b/contrib/sb-concurrency/tests/test-utils.lisp
index 6a5e82a..bc21ebc 100644
--- a/contrib/sb-concurrency/tests/test-utils.lisp
+++ b/contrib/sb-concurrency/tests/test-utils.lisp
@@ -3,15 +3,17 @@
 #+sb-thread
 (progn
 
-(defparameter +timeout+ 60.0)
+(defparameter +timeout+ 30.0)
 
 (defun make-threads (n name fn)
   (loop for i from 1 to n
         collect (make-thread fn :name (format nil "~A-~D" name i))))
 
 (defun timed-join-thread (thread &optional (timeout +timeout+))
-  (sb-sys:with-deadline (:seconds timeout)
-    (join-thread thread :default :aborted)))
+  (handler-case (sb-sys:with-deadline (:seconds timeout)
+                  (join-thread thread :default :aborted))
+    (sb-ext:timeout ()
+      :timeout)))
 
 (defun hang ()
   (join-thread *current-thread*))