Rework test infrastructure to keep track of tests which are disabled

[sbcl.git] / tests / debug.impure.lisp

diff --git a/tests/debug.impure.lisp b/tests/debug.impure.lisp
index 54bea98..df70a78 100644 (file)
--- a/tests/debug.impure.lisp
+++ b/tests/debug.impure.lisp
@@ -112,7 +112,7 @@
                                        (and (equal (car spec) (car frame))
                                             (args-equal (cdr spec)
                                                         (cdr frame))))
-                             (print (list :mismatch spec frame))
+                             (print (list :wanted spec :got frame))
                              (setf result nil)))
                          frame-specs
                          backtrace)
@@ -121,11 +121,10 @@
                         ;; any way.  (Depends on running in the main
                         ;; thread.) FIXME: On Windows we get two
                         ;; extra foreign frames below regular frames.
-                        (let ((end (last backtrace #-win32 2 #+win32 4)))
-                          (unless (equal (caar end)
-                                         'sb-impl::toplevel-init)
-                            (print (list :backtrace-stunted (caar end)))
-                            (setf result nil)))
+                        (unless (find '(sb-impl::toplevel-init) backtrace
+                                      :test #'equal)
+                          (print (list :backtrace-stunted backtrace))
+                          (setf result nil))
                         (return-from outer-handler)))))
           (funcall test-function)))
       result)))
@@ -265,8 +264,7 @@
   (assert (verify-backtrace (lambda () (bug-354 354)) '((bug-354 354)))))
 
 ;;; FIXME: This test really should be broken into smaller pieces
-(with-test (:name (:backtrace :tl-xep)
-                  :fails-on '(and :x86 (or :sunos)))
+(with-test (:name (:backtrace :tl-xep))
   (with-details t
     (assert (verify-backtrace #'namestring
                               '(((sb-c::tl-xep namestring) 0 ?)))))
@@ -274,8 +272,7 @@
     (assert (verify-backtrace #'namestring
                               '((namestring))))))
 
-(with-test (:name (:backtrace :more-processor)
-                  :fails-on '(and :x86 (or :sunos)))
+(with-test (:name (:backtrace :more-processor))
   (with-details t
     (assert (verify-backtrace (lambda () (bt.1.1 :key))
                               '(((sb-c::&more-processor bt.1.1) &rest))))
@@ -291,8 +288,7 @@
     (assert (verify-backtrace (lambda () (bt.1.3 :key))
                               '((bt.1.3 &rest))))))
 
-(with-test (:name (:backtrace :xep)
-                  :fails-on '(and :x86 (or :sunos)))
+(with-test (:name (:backtrace :xep))
   (with-details t
     (assert (verify-backtrace #'bt.2.1
                               '(((sb-c::xep bt.2.1) 0 ?))))
@@ -308,8 +304,7 @@
     (assert (verify-backtrace #'bt.2.3
                               '((bt.2.3 &rest))))))
 
-(with-test (:name (:backtrace :varargs-entry)
-                  :fails-on '(and :x86 (or :sunos)))
+(with-test (:name (:backtrace :varargs-entry))
   (with-details t
     (assert (verify-backtrace #'bt.3.1
                               '(((sb-c::varargs-entry bt.3.1) :key nil))))
@@ -325,8 +320,7 @@
     (assert (verify-backtrace #'bt.3.3
                               '((bt.3.3 &rest))))))
 
-(with-test (:name (:backtrace :hairy-args-processor)
-                  :fails-on '(and :x86 (or :sunos)))
+(with-test (:name (:backtrace :hairy-args-processor))
   (with-details t
     (assert (verify-backtrace #'bt.4.1
                               '(((sb-c::hairy-arg-processor bt.4.1) ?))))
@@ -343,8 +337,7 @@
                               '((bt.4.3 &rest))))))
 
 
-(with-test (:name (:backtrace :optional-processor)
-                  :fails-on '(and :x86 (or :sunos)))
+(with-test (:name (:backtrace :optional-processor))
   (with-details t
     (assert (verify-backtrace #'bt.5.1
                               '(((sb-c::&optional-processor bt.5.1)))))
@@ -435,9 +428,9 @@
 ;;; This is not a WITH-TEST :FAILS-ON PPC DARWIN since there are
 ;;; suspicions that the breakpoint trace might corrupt the whole image
 ;;; on that platform.
-#-(and (or ppc x86 x86-64) (or darwin sunos))
 (with-test (:name (trace :encapsulate nil)
-            :fails-on '(or (and :ppc (not :linux)) :sparc :mips))
+            :fails-on '(or (and :ppc (not :linux)) :sparc :mips)
+           :broken-on '(or :darwin :sunos))
   (let ((out (with-output-to-string (*trace-output*)
                (trace trace-this :encapsulate nil)
                (assert (eq 'ok (trace-this)))
@@ -445,9 +438,9 @@
     (assert (search "TRACE-THIS" out))
     (assert (search "returned OK" out))))
 
-#-(and (or ppc x86 x86-64) darwin)
 (with-test (:name (trace-recursive :encapsulate nil)
-            :fails-on '(or (and :ppc (not :linux)) :sparc :mips))
+            :fails-on '(or (and :ppc (not :linux)) :sparc :mips :sunos)
+           :broken-on '(or :darwin (and :x86 :sunos)))
   (let ((out (with-output-to-string (*trace-output*)
                (trace trace-fact :encapsulate nil)
                (assert (= 120 (trace-fact 5)))