X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fthreads.pure.lisp;h=118422c88db1ce3dc73fb1bdf79923ea15411890;hb=f0da2f63aa0b4e6d4dbf884854a4bf2dfdd01fc0;hp=adcf13a0a9263cfc9fc1fdef14100de463dfb153;hpb=c6fecd1dcff10bce2e88f67bfade3aab3f7309ac;p=sbcl.git

diff --git a/tests/threads.pure.lisp b/tests/threads.pure.lisp
index adcf13a..118422c 100644
--- a/tests/threads.pure.lisp
+++ b/tests/threads.pure.lisp
@@ -179,11 +179,9 @@
 
 ;;; Disabled on Darwin due to deadlocks caused by apparent OS specific deadlocks,
 ;;; wich _appear_ to be caused by malloc() and free() not being thread safe: an
-;;; interrupted malloc in one thread can apparently block a free in another. There
-;;; are also some indications that pthread_mutex_lock is not re-entrant.
+;;; interrupted malloc in one thread can apparently block a free in another.
 (with-test (:name symbol-value-in-thread.3
-            :skipped-on '(not :sb-thread)
-            :broken-on :darwin)
+            :skipped-on '(not :sb-thread))
   (let* ((parent *current-thread*)
          (semaphore (make-semaphore))
          (running t)
@@ -307,13 +305,10 @@
                 (t1 (sb-thread:make-thread (test m1 m2 s1 s2) :name "T1"))
                 (t2 (sb-thread:make-thread (test m2 m1 s2 s1) :name "T2")))
            ;; One will deadlock, and the other will then complete normally.
-           ;; ...except sometimes, when we get unlucky, and both will do
-           ;; the deadlock detection in parallel and both signal.
            (let ((res (list (sb-thread:join-thread t1)
                             (sb-thread:join-thread t2))))
              (assert (or (equal '(:deadlock :ok) res)
-                         (equal '(:ok :deadlock) res)
-                         (equal '(:deadlock :deadlock) res))))))))
+                         (equal '(:ok :deadlock) res))))))))
 
 (with-test (:name deadlock-detection.2 :skipped-on '(not :sb-thread))
   (let* ((m1 (sb-thread:make-mutex :name "M1"))
@@ -476,7 +471,7 @@
                    collect (make-thread
                             (lambda ()
                               (sleep (random 0.02))
-                              (wait-on-semaphore sem :timeout 0.01)))))))
+                              (wait-on-semaphore sem :timeout 0.5)))))))
     (loop repeat 5
           do (signal-semaphore sem 2))
     (let ((ok (count-if #'join-thread threads)))
@@ -552,3 +547,34 @@
     (signal-semaphore sem)
     (try-semaphore sem 1 note)
     (assert (semaphore-notification-status note))))
+
+(with-test (:name (:return-from-thread :normal-thread))
+  (let* ((thread (make-thread (lambda ()
+                                (return-from-thread (values 1 2 3))
+                                :foo)))
+         (values (multiple-value-list (join-thread thread))))
+    (unless (equal (list 1 2 3) values)
+      (error "got ~S, wanted (1 2 3)" values))))
+
+(with-test (:name (:return-from-thread :main-thread))
+  (assert (main-thread-p))
+  (assert (eq :oops
+              (handler-case
+                  (return-from-thread t)
+                (thread-error ()
+                  :oops)))))
+
+(with-test (:name (:abort-thread :normal-thread))
+  (let ((thread (make-thread (lambda ()
+                               (abort-thread)
+                               :foo))))
+    (assert (eq :aborted! (join-thread thread :default :aborted!)))))
+
+(with-test (:name (:abort-thread :main-thread))
+  (assert (main-thread-p))
+  (assert (eq :oops
+              (handler-case
+                  (abort-thread)
+                (thread-error ()
+                  :oops)))))
+