From 4d6d56f002f8db016303f093d02721a05e8e4557 Mon Sep 17 00:00:00 2001
From: Alex Shinn <ashinn@users.noreply.github.com>
Date: Fri, 8 Mar 2013 19:12:02 +0900
Subject: [PATCH] printing test vars on fail/error when provided

---
 lib/chibi/test.scm | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/chibi/test.scm b/lib/chibi/test.scm
index 31331233..c826952f 100644
--- a/lib/chibi/test.scm
+++ b/lib/chibi/test.scm
@@ -140,11 +140,11 @@
     ((_ (vars ...) n expect expr ((key . val) ...))
      (test-run (lambda () expect)
                (lambda () expr)
-               (cons (cons 'name n)
-                     '((source . expr)
-                       ;;(var-names . (vars ...))
-                       ;;(var-values . ,(list vars))
-                       (key . val) ...))))))
+               `((name . ,n)
+                 (source . expr)
+                 (var-names . (vars ...))
+                 (var-values . ,(list vars ...))
+                 (key . val) ...)))))
 
 ;;> @subsubsubsection{@scheme{(test-exit)}}
 
@@ -456,7 +456,22 @@
    ((eq? status 'FAIL)
     (display indent)
     (display "expected ") (write (assq-ref info 'expected))
-    (display " but got ") (write (assq-ref info 'result)) (newline))))
+    (display " but got ") (write (assq-ref info 'result)) (newline)))
+  ;; print variables
+  (cond
+   ((and (memq status '(FAIL ERROR)) (assq-ref info 'var-names))
+    => (lambda (names)
+         (let ((values (assq-ref info 'var-values)))
+           (if (and (pair? names)
+                    (pair? values)
+                    (= (length names) (length values)))
+               (let ((indent2
+                      (string-append indent (make-string 2 #\space))))
+                 (for-each
+                  (lambda (name value)
+                    (display indent2) (write name) (display ": ")
+                    (write value) (newline))
+                  names values))))))))
 
 (define (test-print-source indent status info)
   (case status