X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-introspect%2Ftest-driver.lisp;h=aa7bfc8cc3a53a44fbe92b35a3ae59bee6b30eec;hb=47fe7f5b227bba5964d5dd4d2a93d9e4b1d1502e;hp=810a295f1fea5ef4704a0167966d71658031319c;hpb=06c288327bb8ea3a9534c63c0a8a909445a62054;p=sbcl.git

diff --git a/contrib/sb-introspect/test-driver.lisp b/contrib/sb-introspect/test-driver.lisp
index 810a295..aa7bfc8 100644
--- a/contrib/sb-introspect/test-driver.lisp
+++ b/contrib/sb-introspect/test-driver.lisp
@@ -12,6 +12,12 @@
 
 (in-package :sb-introspect-test)
 
+(defmacro deftest* ((name &key fails-on) form &rest results)
+  `(progn
+     (when (sb-impl::featurep ',fails-on)
+       (pushnew ',name sb-rt::*expected-failures*))
+     (deftest ,name ,form ,@results)))
+
 (deftest function-lambda-list.1
     (function-lambda-list 'cl-user::one)
   (cl-user::a cl-user::b cl-user::c))
@@ -293,21 +299,27 @@
   t)
 
 ;;; Skip the whole damn test on GENCGC PPC -- the combination is just
-;;; to flaky for this to make too much sense.
-;; #-(and ppc gencgc)
-
-;;; It appears that this test can fail due to systematic issues (possibly
-;;; with the C compiler used) which we cannot detect based on *features*.
-;;; Until this issue has been fixed, I am disabling this test entirely to
-;;; to allow installation of the contrib on affected builds. C.f. lp1057631.
-;;; --DFL
-#-gencgc
-(deftest allocation-information.4
+;;; to flaky for this to make too much sense.  GENCGC SPARC almost
+;;; certainly exhibits the same behavior patterns (or antipatterns) as
+;;; GENCGC PPC.
+;;;
+;;; -- It appears that this test can also fail due to systematic issues
+;;; (possibly with the C compiler used) which we cannot detect based on
+;;; *features*.  Until this issue has been fixed, I am marking this test
+;;; as failing on Windows to allow installation of the contrib on
+;;; affected builds, even if the underlying issue is (possibly?) not even
+;;; strictly related to windows.  C.f. lp1057631.  --DFL
+;;;
+(deftest* (allocation-information.4
+           ;; Ignored as per the comment above, even though it seems
+           ;; unlikely that this is the right condition.
+           :fails-on (or :win32 (and (or :ppc :sparc) :gencgc)))
     #+gencgc
     (tai #'cons :heap
          ;; FIXME: This is the canonical GENCGC result. On PPC we sometimes get
          ;; :LARGE T, which doesn't seem right -- but ignore that for now.
-         '(:space :dynamic :generation 6 :write-protected t :boxed t :pinned nil :large nil)
+         `(:space :dynamic :generation ,sb-vm:+pseudo-static-generation+
+           :write-protected t :boxed t :pinned nil :large nil)
          :ignore (list :page #+ppc :large))
     #-gencgc
     (tai :cons :heap