X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fassertoid.lisp;h=0469450505393b3a52356fa17b82440e43603537;hb=9514c25e89aad10784c6d04fea4595d8c8ae68cc;hp=c6dd931b4aa013840236e979603965562cab34bb;hpb=d1c237164f9bd00879843cba7a79c05449cf50f7;p=sbcl.git

diff --git a/tests/assertoid.lisp b/tests/assertoid.lisp
index c6dd931..0469450 100644
--- a/tests/assertoid.lisp
+++ b/tests/assertoid.lisp
@@ -18,8 +18,8 @@
   `(nth-value 1
      (ignore-errors ,@body)))
 
-(defmacro raises-error? (&body body)
-  `(typep (nth-value 1 (ignore-errors ,@body)) 'error))
+(defmacro raises-error? (form &optional (error-subtype-spec 'error))
+  `(typep (nth-value 1 (ignore-errors ,form)) ',error-subtype-spec))
 
 ;;; EXPR is an expression to evaluate (both with EVAL and with
 ;;; COMPILE/FUNCALL). EXTRA-OPTIMIZATIONS is a list of lists of
@@ -40,8 +40,8 @@
 ;;; LAMBDA. EXPECTED-EQL, EXPECTED-EQUAL, and EXPECTED-EQUALP are
 ;;; shorthand for special cases of EXPECTED-LAMBDA.
 ;;;
-;;; Use EXPECTED-ERROR to require an error to be thrown. Use
-;;; EXPECTED-ERROR-LAMBDA to require that an error be thrown and
+;;; Use EXPECTED-ERROR to require an error to be signalled. Use
+;;; EXPECTED-ERROR-LAMBDA to require that an error be signalled and
 ;;; that further it satisfies the given lambda.
 (defmacro assertoid (expr
 		     &key