This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 2b39eba64aa3f2b122bcc275e6597f9cb2a5f7f4 (commit) from 55d04a31ba05d20f4e9ab6be9548d374c900b197 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2b39eba64aa3f2b122bcc275e6597f9cb2a5f7f4 Author: Raymond Toy <toy.raymond@gmail.com> Date: Fri Nov 28 10:21:52 2014 -0800 Correct the tests for the generic function lambda lists. The check for invalid gf lambda lists happens during macroexpansion, so update the tests to catch this during macroexpansion. This fixes three of the issues in ticket:95. diff --git a/tests/pcl/defgeneric.lisp b/tests/pcl/defgeneric.lisp index 05f01c7..2cf9e07 100644 --- a/tests/pcl/defgeneric.lisp +++ b/tests/pcl/defgeneric.lisp @@ -32,13 +32,12 @@ (in-package "PCL-TESTS") +;; These errors are signaled during macroexpansion of the defgeneric +;; form so catch the errors during macroexpansion. (defmacro define-gf-lambda-list-test (name lambda-list) - `(deftest ,name - (multiple-value-bind (r c) - (ignore-errors - (defgeneric g ,lambda-list)) - (values (null r) (typep c 'error))) - t t)) + `(define-test ,name + (assert-error 'program-error + (macroexpand '(defgeneric g ,lambda-list))))) (define-gf-lambda-list-test defgeneric-lambda-list.0 (a &optional (b 1))) (define-gf-lambda-list-test defgeneric-lambda-list.1 (a &key (b 1))) ----------------------------------------------------------------------- Summary of changes: tests/pcl/defgeneric.lisp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) hooks/post-receive -- CMU Common Lisp