X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fdebug.impure.lisp;h=ea5d8b7160933bee458796bce84972d1a8d35a3a;hb=b66385e2031fc2cac17dd129df0af400beb48a22;hp=bd9526d93022d85db799ded73ea4d2cecbb23c0c;hpb=f35f14479a64dd97f93d2d91dc154bdc141d6842;p=sbcl.git

diff --git a/tests/debug.impure.lisp b/tests/debug.impure.lisp
index bd9526d..ea5d8b7 100644
--- a/tests/debug.impure.lisp
+++ b/tests/debug.impure.lisp
@@ -14,6 +14,11 @@
 ;;;; more information.
 
 (cl:in-package :cl-user)
+
+;;; The debugger doesn't have any native knowledge of the interpreter
+(when (eq sb-ext:*evaluator-mode* :interpret)
+  (sb-ext:quit :unix-status 104))
+
 
 ;;;; Check that we get debug arglists right.
 
@@ -38,7 +43,13 @@
     ;; happen to be the two case that I had my nose rubbed in when
     ;; debugging a GC problem caused by applying %SIMPLE-FUN-ARGLIST to
     ;; a closure. -- WHN 2001-06-05)
-    (t :unknown)))
+    (t
+     #+sb-eval
+     (if (typep fun 'sb-eval::interpreted-function)
+         (sb-eval::interpreted-function-lambda-list fun)
+         :unknown)
+     #-sb-eval
+     :unknown)))
 
 (defun zoop (zeep &key beep)
   blurp)
@@ -148,8 +159,13 @@
 
   ;; bug 353: This test fails at least most of the time for x86/linux
   ;; ca. 0.8.20.16. -- WHN
-  (with-test (:name (:undefined-function :bug-356)
-              :fails-on '(or (and :x86 :linux) :alpha))
+  (with-test (:name (:undefined-function :bug-353)
+              ;; This used to have fewer :fails-on features pre-0.9.16.38,
+              ;; but it turns out that the bug was just being masked by
+              ;; the presence of the IR1 stepper instrumentation (and
+              ;; is thus again failing now that the instrumentation is
+              ;; no more).
+              :fails-on '(or :x86 :x86-64 :alpha))
     (assert (verify-backtrace
              (lambda () (test #'not-optimized))
              (list *undefined-function-frame*
@@ -340,6 +356,11 @@
 (defun trace-this ()
   'ok)
 
+(defun trace-fact (n)
+  (if (zerop n)
+      1
+      (* n (trace-fact (1- n)))))
+
 (let ((out (with-output-to-string (*trace-output*)
              (trace trace-this)
              (assert (eq 'ok (trace-this)))
@@ -353,7 +374,7 @@
 ;;; on that platform.
 #-(and (or ppc x86) darwin)
 (with-test (:name (trace :encapsulate nil)
-            :fails-on '(or ppc sparc))
+            :fails-on '(or :ppc :sparc :mips))
   (let ((out (with-output-to-string (*trace-output*)
                (trace trace-this :encapsulate nil)
                (assert (eq 'ok (trace-this)))
@@ -361,6 +382,17 @@
     (assert (search "TRACE-THIS" out))
     (assert (search "returned OK" out))))
 
+#-(and (or ppc x86) darwin)
+(with-test (:name (trace-recursive :encapsulate nil)
+            :fails-on '(or :ppc :sparc :mips))
+  (let ((out (with-output-to-string (*trace-output*)
+               (trace trace-fact :encapsulate nil)
+               (assert (= 120 (trace-fact 5)))
+               (untrace))))
+    (assert (search "TRACE-FACT" out))
+    (assert (search "returned 1" out))
+    (assert (search "returned 120" out))))
+
 ;;;; test infinite error protection
 
 (defmacro nest-errors (n-levels error-form)