-(defmacro in-suite* (suite-name &key in)
- "Just like in-suite, but silently creates missing suites."
- `(%in-suite ,suite-name :in ,in :fail-on-error nil))
-
-(defmacro %in-suite (suite-name &key (fail-on-error t) in)
- (with-unique-names (suite)
- `(progn
- (if-bind ,suite (get-test ',suite-name)
- (setf *suite* ,suite)
- (progn
- (when ,fail-on-error
- (cerror "Create a new suite named ~A."
- "Unkown suite ~A." ',suite-name))
- (setf (get-test ',suite-name) (make-suite ',suite-name :in ',in)
- *suite* (get-test ',suite-name))))
- ',suite-name)))
+(defmacro in-suite* (suite-name &rest def-suite-args)
+ "Same effect as `IN-SUITE`, but if `SUITE-NAME` does not exist it
+will be created (as per `DEF-SUITE`)"
+ `(%in-suite ,suite-name
+ :fail-on-error nil
+ ,@def-suite-args))
+
+(defmacro %in-suite (suite-name &rest def-suite-args &key fail-on-error &allow-other-keys)
+ (declare (ignore fail-on-error))
+ (with-gensyms (suite)
+ (let ((fail-on-error (getf def-suite-args :fail-on-error t)))
+ (remf def-suite-args :fail-on-error)
+ `(progn
+ (if-let (,suite (get-test ',suite-name))
+ (setf *suite* ,suite)
+ (progn
+ (when ,fail-on-error
+ (cerror "Create a new suite named ~A."
+ "Unknown suite ~A." ',suite-name))
+ (setf (get-test ',suite-name) (make-suite ',suite-name ,@def-suite-args)
+ *suite* (get-test ',suite-name))))
+ ',suite-name))))