X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-util.lisp;h=8381019c7be36d165902be558dfdd26ff3ab93ac;hb=b14aefb22fd710673b1a1005add3c0425713d2a0;hp=f9ca05f0338013919b181a24a63f54e61bb6e3b7;hpb=1809389def0b7147e354acce1316cfa109091b51;p=sbcl.git

diff --git a/tests/test-util.lisp b/tests/test-util.lisp
index f9ca05f..8381019 100644
--- a/tests/test-util.lisp
+++ b/tests/test-util.lisp
@@ -18,21 +18,28 @@
   (terpri *trace-output*)
   (force-output *trace-output*))
 
-(defmacro with-test ((&key fails-on name) &body body)
+(defmacro with-test ((&key fails-on broken-on skipped-on name) &body body)
   (let ((block-name (gensym)))
-    `(block ,block-name
-       (handler-bind ((error (lambda (error)
-                               (if (expected-failure-p ,fails-on)
-                                   (fail-test :expected-failure ',name error)
-                                   (fail-test :unexpected-failure ',name error))
-                               (return-from ,block-name))))
-         (progn
-           (log-msg "Running ~S" ',name)
-           (start-test)
-           ,@body
-           (if (expected-failure-p ,fails-on)
-               (fail-test :unexpected-success ',name nil)
-               (log-msg "Success ~S" ',name)))))))
+    `(progn
+       (start-test)
+       (cond
+         ((broken-p ,broken-on)
+          (fail-test :skipped-broken ',name "Test broken on this platform"))
+         ((skipped-p ,skipped-on)
+          (fail-test :skipped-disabled ',name "Test disabled for this combination of platform and features"))
+         (t
+          (block ,block-name
+            (handler-bind ((error (lambda (error)
+                                    (if (expected-failure-p ,fails-on)
+                                        (fail-test :expected-failure ',name error)
+                                        (fail-test :unexpected-failure ',name error))
+                                    (return-from ,block-name))))
+              (progn
+                (log-msg "Running ~S" ',name)
+                ,@body
+                (if (expected-failure-p ,fails-on)
+                    (fail-test :unexpected-success ',name nil)
+                    (log-msg "Success ~S" ',name))))))))))
 
 (defun report-test-status ()
   (with-standard-io-syntax
@@ -47,21 +54,36 @@
     (setf *test-count* 0))
   (incf *test-count*))
 
+(defun really-invoke-debugger (condition)
+  (with-simple-restart (continue "Continue")
+    (let ((*invoke-debugger-hook* *invoke-debugger-hook*))
+      (enable-debugger)
+      (invoke-debugger condition))))
+
 (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))
 
-(defun really-invoke-debugger (condition)
-  (with-simple-restart (continue "Continue")
-    (let ((*invoke-debugger-hook* *invoke-debugger-hook*))
-      (enable-debugger)
-      (invoke-debugger condition))))
+(defun broken-p (broken-on)
+  (sb-impl::featurep broken-on))
+
+(defun skipped-p (skipped-on)
+  (sb-impl::featurep skipped-on))
+
+(defun test-env ()
+  (cons (format nil "SBCL_MACHINE_TYPE=~A" (machine-type))
+        (cons (format nil "SBCL_SOFTWARE_TYPE=~A" (software-type))
+              (posix-environ))))