[Maxima-commits] CVS: maxima/src mload.lisp,1.44,1.45

[Robert D. <rob...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24614/src

Modified Files:
	mload.lisp 
Log Message:
(1) Output a message about the number of expected errors,
e.g. "Running tests in rtest_foo: xxx/yyy tests passed (not counting zzz expected errors)"
(2) Make output to rtest_foo.ERR log file more informative
(output the test number and label expected output)

Index: mload.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/mload.lisp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- mload.lisp	6 Jun 2007 14:33:28 -0000	1.44
+++ mload.lisp	13 Jun 2007 14:32:59 -0000	1.45
@@ -374,28 +374,35 @@
 		       (push i all-differences)
 		       (displa next-result)
 		       (cond ((and *collect-errors* error-log)
-			      (mgrind (third expr) error-log)
+			      (format error-log "/* Problem ~A */~%" i)
+                  (mgrind (third expr) error-log)
 			      (list-variable-bindings (third expr) error-log)
 			      (format error-log ";~%")
-			      (format error-log "//*Erroneous Result?:~%")
-			      (mgrind result error-log) (format error-log "*// ")
+			      (format error-log "/* Erroneous Result?:~%")
+			      (mgrind result error-log) (format error-log " */ ")
 			      (terpri error-log)
+                  (format error-log "/* Expected result: */~%")
 			      (mgrind next-result error-log)
 			      (format error-log ";~%~%"))))))))
       (close strm))
     (cond (error-log
 	   (or (streamp *collect-errors*)
 	       (close error-log))))
-    (cond ((null all-differences)
-	   (format t "~a/~a tests passed.~%" num-problems num-problems) '((mlist)))
-	  (t (progn
-	       (format t "~%~a/~a tests passed.~%" 
-		       (- num-problems (length all-differences)) num-problems)
-	       (let ((s (if (> (length all-differences) 1) "s" "")))
-		 (format t "~%The following ~A problem~A failed: ~A~%" 
-			 (length all-differences) s (reverse all-differences)))
-	       `((mlist),filename ,@ all-differences))))))
-	   
+    (let
+      ((expected-errors-trailer
+         (if (or (null expected-errors) (= (length expected-errors) 0))
+           ""
+           (format nil " (not counting ~a expected errors)" (length expected-errors)))))
+      (cond ((null all-differences)
+           (format t "~a/~a tests passed~a.~%" num-problems num-problems expected-errors-trailer) '((mlist)))
+        (t (progn
+             (format t "~%~a/~a tests passed~a.~%" 
+                 (- num-problems (length all-differences)) num-problems expected-errors-trailer)
+             (let ((s (if (> (length all-differences) 1) "s" "")))
+           (format t "~%The following ~A problem~A failed: ~A~%" 
+               (length all-differences) s (reverse all-differences)))
+             `((mlist),filename ,@(reverse all-differences))))))))
+       
 ;;to keep track of global values during the error:
 (defun list-variable-bindings (expr &optional str &aux tem)
   (loop for v in(cdr ($listofvars  expr))