X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-util.lisp;h=92a4b32090e40e9681bf02562bd90ba4b92ea790;hb=d6f9676ae94419cb5544c45821a8d31adbc1fbe8;hp=2e278ae27464bc6e3e17f6a6900b96ad7698acbe;hpb=ecfd159f29d31d2cc08d4e5598346c04c9387636;p=sbcl.git

diff --git a/tests/test-util.lisp b/tests/test-util.lisp
index 2e278ae..92a4b32 100644
--- a/tests/test-util.lisp
+++ b/tests/test-util.lisp
@@ -55,14 +55,18 @@
   (incf *test-count*))
 
 (defun fail-test (type test-name condition)
-  (log-msg "~@<~A ~S ~:_due to ~S: ~4I~:_\"~A\"~:>"
-           type test-name condition condition)
+  (if (stringp condition)
+      (log-msg "~@<~A ~S ~:_~A~:>"
+               type test-name condition)
+      (log-msg "~@<~A ~S ~:_due to ~S: ~4I~:_\"~A\"~:>"
+               type test-name condition condition))
   (push (list type *test-file* (or test-name *test-count*))
         *failures*)
-  (when (or (and *break-on-failure*
-                 (not (eq type :expected-failure)))
-            *break-on-expected-failure*)
-    (really-invoke-debugger condition)))
+  (unless (stringp condition)
+    (when (or (and *break-on-failure*
+                   (not (eq type :expected-failure)))
+              *break-on-expected-failure*)
+      (really-invoke-debugger condition))))
 
 (defun expected-failure-p (fails-on)
   (sb-impl::featurep fails-on))