Fix win32-foreign-stack-unwind.impure test.

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

diff --git a/tests/debug.impure.lisp b/tests/debug.impure.lisp
index b902b74..e64e664 100644 (file)
--- a/tests/debug.impure.lisp
+++ b/tests/debug.impure.lisp
@@ -174,11 +174,11 @@
 (with-test (:name :backtrace-interrupted-condition-wait
             :skipped-on '(not :sb-thread)
                   ;; For some unfathomable reason the backtrace becomes
-                  ;; stunted on Darwin, ending at _sigtramp, when we add
-                  ;; :TIMEOUT NIL to the frame we expect. If we leave it out,
-                  ;; the backtrace is fine -- but the test fails. I can only
-                  ;; boggle right now.
-            :fails-on '(or (and :x86 :linux) :darwin))
+                  ;; stunted, ending at _sigtramp, when we add :TIMEOUT NIL to
+                  ;; the frame we expect. If we leave it out, the backtrace is
+                  ;; fine -- but the test fails. I can only boggle right now.
+            :fails-on '(or (and :x86 :linux)
+                           (and :win32 :sb-thread)))
   (let ((m (sb-thread:make-mutex))
         (q (sb-thread:make-waitqueue)))
     (assert (verify-backtrace
@@ -347,14 +347,17 @@
     (assert (verify-backtrace #'bt.2.3
                               '((bt.2.3 &rest))))))
 
+;;; This test is somewhat deceptively named. Due to confusion in debug naming
+;;; these functions used to have sb-c::varargs-entry debug names for their
+;;; main lambda.
 (with-test (:name (:backtrace :varargs-entry))
   (with-details t
     (assert (verify-backtrace #'bt.3.1
-                              '(((sb-c::varargs-entry bt.3.1) :key nil))))
+                              '((bt.3.1 :key nil))))
     (assert (verify-backtrace #'bt.3.2
-                              '(((sb-c::varargs-entry bt.3.2) :key ?))))
+                              '((bt.3.2 :key ?))))
     (assert (verify-backtrace #'bt.3.3
-                              '(((sb-c::varargs-entry bt.3.3) &rest)))))
+                              '((bt.3.3 &rest)))))
   (with-details nil
     (assert (verify-backtrace #'bt.3.1
                               '((bt.3.1 :key nil))))
@@ -363,14 +366,17 @@
     (assert (verify-backtrace #'bt.3.3
                               '((bt.3.3 &rest))))))
 
+;;; This test is somewhat deceptively named. Due to confusion in debug naming
+;;; these functions used to have sb-c::hairy-args-processor debug names for
+;;; their main lambda.
 (with-test (:name (:backtrace :hairy-args-processor))
   (with-details t
     (assert (verify-backtrace #'bt.4.1
-                              '(((sb-c::hairy-arg-processor bt.4.1) ?))))
+                              '((bt.4.1 ?))))
     (assert (verify-backtrace #'bt.4.2
-                              '(((sb-c::hairy-arg-processor bt.4.2) ?))))
+                              '((bt.4.2 ?))))
     (assert (verify-backtrace #'bt.4.3
-                              '(((sb-c::hairy-arg-processor bt.4.3) &rest)))))
+                              '((bt.4.3 &rest)))))
   (with-details nil
     (assert (verify-backtrace #'bt.4.1
                               '((bt.4.1 ?))))
@@ -651,6 +657,8 @@
                  (if (eq '* match)
                      ;; Whatever, till the next line matches.
                      (let ((text (pop targets)))
+                       #+nil
+                       (format *error-output* "Looking for: ~A~%" text)
                        (unless (search text line)
                          (push text targets)
                          (push match targets)))
@@ -695,7 +703,7 @@
       (let ((f #'(lambda (x cont)
                    (print x (make-broadcast-stream))
                    (if (zerop x)
-                       (error "foo")
+                       (error "~%foo")
                        (funcall cont (1- x) cont)))))
         (funcall f 10 f)))
    '*
@@ -703,7 +711,7 @@
    '*
    "foo"
    '*
-   "source: (ERROR \"foo\")"
+   "source: (ERROR \"~%foo\")"
    '*
    "(LAMBDA (X CONT)"
    '*