gcl.git - GNU Common Lisp

diff --git a/gcl/ansi-tests/rt.lsp b/gcl/ansi-tests/rt.lsp
index 2e3ce5007..7ebb8cbce 100644
--- a/gcl/ansi-tests/rt.lsp
+++ b/gcl/ansi-tests/rt.lsp

@@ -192,16 +192,13 @@ them.")

(not (equalp-with-case r (vals entry)))))

(when (pend entry)

(let ((*print-circle* *print-circle-on-failure*))

- (format s "~&Test ~:@(~S~) failed~

- ~%Form: ~S~

- ~%Expected value~P: ~

- ~{~S~^~%~17t~}~%"

- *test* (form entry)

- (length (vals entry))

- (vals entry))

- (format s "Actual value~P: ~

- ~{~S~^~%~15t~}.~%"

- (length r) r)))))

+ (format s "~&Test ~:@(~S~) failed~%Form: ~S~%Expected value~P:~%"

+ *test* (form entry) (length (vals entry)))

+ (dolist (v (vals entry)) (format s "~10t~S~%" v))

+ (format s "Actual value~P:~%" (length r))

+ (dolist (v r)

+ (format s "~10t~S~:[~; [~2:*~A]~]~%"

+ v (typep v 'condition)))))))

(when (not (pend entry)) *test*))

(defun continue-testing ()

@@ -255,5 +252,19 @@ them.")

~^, ~}~)."

(length new-failures)

new-failures)))

+ (when *expected-failures*

+ (let ((pending-table (make-hash-table :test #'equal)))

+ (dolist (ex pending)

+ (setf (gethash ex pending-table) t))

+ (let ((unexpected-successes

+ (loop :for ex :in *expected-failures*

+ :unless (gethash ex pending-table) :collect ex)))

+ (if unexpected-successes

+ (format t "~&~:D unexpected successes: ~

+ ~:@(~{~<~% ~1:;~S~>~

+ ~^, ~}~)."

+ (length unexpected-successes)

+ unexpected-successes)

+ (format t "~&No unexpected successes.")))))

))

(null pending))))