Fix test in SBCL

[jscl.git] / tests.lisp

diff --git a/tests.lisp b/tests.lisp
index 6fce25e..65b4ae2 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -1,9 +1,11 @@
-(defvar *total-tests* 0)
-(defvar *passed-tests* 0)
-(defvar *failed-tests* 0)
+(defparameter *total-tests* 0)
+(defparameter *passed-tests* 0)
+(defparameter *failed-tests* 0)
+(defparameter *expected-failures* 0)
+(defparameter *unexpected-passes* 0)
 
-(defvar *expected-failures* 0)
-(defvar *unexpected-passes* 0)
+(defvar *use-html-output-p* t)
+(defun if-html (string) (if *use-html-output-p* string ""))
 
 (defvar *timestamp* nil)
 
@@ -14,9 +16,11 @@
         (write-line ,(concat "Test `" (prin1-to-string condition) "' passed"))
         (incf *passed-tests*))
        (t
-        (write-line ,(concat "<font color=red>Test `"
-                             (prin1-to-string condition) 
-                             "' failed.</font>"))
+        (write-line (concat (if-html "<font color=red>")
+                            "Test `"
+                            ,(prin1-to-string condition) 
+                            "' failed."
+                            (if-html "</font>")))
         (incf *failed-tests*)))
      (incf *total-tests*)))
 
@@ -24,9 +28,11 @@
   `(progn
      (cond
        (,condition
-        (write-line ,(concat "<font color=orange>Test `"
-                             (prin1-to-string condition)
-                             "' passed unexpectedly!</font>"))
+         (write-line (concat (if-html "<font color=orange>")
+                             "Test `"
+                             ,(prin1-to-string condition)
+                             "' passed unexpectedly!"
+                             (if-html "</font>")))
         (incf *unexpected-passes*))
        (t
         (write-line ,(concat "Test `" (prin1-to-string condition) "' failed expectedly."))