X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=tester.lisp;h=2a15b4b9c00e759bf50094e81149e986b4f927df;hb=de40c6c274a9eca42df733bd573d6b3f0a381f0c;hp=c66a044b099a6b950c5f0c7dfcb9752feb824468;hpb=9886ed9215b826c76b1860f41ad463ab07be87d3;p=ptester.git diff --git a/tester.lisp b/tester.lisp index c66a044..2a15b4b 100644 --- a/tester.lisp +++ b/tester.lisp @@ -26,7 +26,7 @@ ;;;; from the original ACL 6.1 sources: ;; Id: tester.cl,v 2.2.12.1 2001/06/05 18:45:10 layer Exp -;; $Id: tester.lisp,v 1.1 2002/09/30 10:16:25 kevin Exp $ +;; $Id: tester.lisp,v 1.2 2003/02/23 06:10:02 kevin Exp $ (defpackage :util.test (:use :common-lisp) @@ -392,6 +392,12 @@ discriminate on new versus known failures." (defvar *announce-test* nil) ;; if true announce each test that was done +(defmacro errorset (form) + `(handler-case (cons t (multiple-value-list ,form)) + (error (cond) + (format *error-output* "~&An error occurred: ~a~%" cond) + nil))) + (defun test-check (&key (predicate #'eql) expected-result test-results test-form multiple-values fail-info known-failure @@ -407,7 +413,7 @@ discriminate on new versus known failures." (flet ((check (expected-result result) (let* ((results (multiple-value-list - (errorset (funcall predicate expected-result result) t))) + (errorset (funcall predicate expected-result result)))) (failed (null (car results)))) (if* failed then (setq predicate-failed t)