X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-util.lisp;h=20b2c548a0ae9ead12e204a6b3b46d17bb69835a;hb=bcd323c39d6f5f80020ba4a5d9eb8d348c6cc499;hp=43bafa04c4f0d943472deb3e0fe3788ce6b79761;hpb=69990bc42314706e9d646ddd8f6b911f46d0052c;p=sbcl.git

diff --git a/tests/test-util.lisp b/tests/test-util.lisp
index 43bafa0..20b2c54 100644
--- a/tests/test-util.lisp
+++ b/tests/test-util.lisp
@@ -69,10 +69,15 @@
                     (setf ,threads (union (union *threads-to-kill*
                                                  *threads-to-join*)
                                           ,threads))
+                    #+(and sb-safepoint-strictly (not win32))
+                    (dolist (thread (sb-thread:list-all-threads))
+                      (when (typep thread 'sb-thread:signal-handling-thread)
+                        (ignore-errors (sb-thread:join-thread thread))))
                     (dolist (thread (sb-thread:list-all-threads))
                       (unless (or (not (sb-thread:thread-alive-p thread))
                                   (eql thread sb-thread:*current-thread*)
-                                  (member thread ,threads))
+                                  (member thread ,threads)
+                                  (sb-thread:thread-emphemeral-p thread))
                         (setf any-leftover thread)
                         (ignore-errors (sb-thread:terminate-thread thread))))
                     (when any-leftover