projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use AMOP representation of canonicalized default initargs for conditions
[sbcl.git]
/
tests
/
test-util.lisp
diff --git
a/tests/test-util.lisp
b/tests/test-util.lisp
index
43bafa0
..
d6246bf
100644
(file)
--- a/
tests/test-util.lisp
+++ b/
tests/test-util.lisp
@@
-39,7
+39,7
@@
(defmacro with-test ((&key fails-on broken-on skipped-on name)
&body body)
(let ((block-name (gensym))
(defmacro with-test ((&key fails-on broken-on skipped-on name)
&body body)
(let ((block-name (gensym))
- (threads (gensym "THREADS")))
+ #+sb-thread (threads (gensym "THREADS")))
`(progn
(start-test)
(cond
`(progn
(start-test)
(cond
@@
-69,10
+69,15
@@
(setf ,threads (union (union *threads-to-kill*
*threads-to-join*)
,threads))
(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*)
(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
(setf any-leftover thread)
(ignore-errors (sb-thread:terminate-thread thread))))
(when any-leftover