X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Frun.lisp;h=bc36025ff16215733719d12375bbfecf02bbb8f1;hb=aeda92bda135a87daff3b1267fb08c149df61040;hp=7ff6692fe4e060e2e32b0f94cee98d7ce5779376;hpb=e3585826886c694d40d2a0f3a28ce181dd66300b;p=fiveam.git

diff --git a/src/run.lisp b/src/run.lisp
index 7ff6692..bc36025 100644
--- a/src/run.lisp
+++ b/src/run.lisp
@@ -66,7 +66,7 @@ run."))
     (:unknown
      (setf (status test) :resolving)
      (if (or (not (depends-on test))
-             (resolve-dependencies (depends-on test)))
+             (eql t (resolve-dependencies (depends-on test))))
          (progn
            (run-test-lambda test)
            (status test))
@@ -149,7 +149,10 @@ run."))
                      (restart-case
                          (let ((*readtable* (copy-readtable))
                                (*package* (runtime-package test)))
-                           (funcall (test-lambda test)))
+                           (if (collect-profiling-info test)
+                               (setf (profiling-info test)
+                                     (arnesi:collect-timing (test-lambda test)))
+                               (funcall (test-lambda test))))
                        (retest ()
                          :report (lambda (stream)
                                    (format stream "~@<Rerun the test ~S~@:>" test))
@@ -177,15 +180,22 @@ run."))
 
 (defmethod %run ((suite test-suite))
   (let ((suite-results '()))
-    (bind-run-state ((result-list '()))
-      (loop for test being the hash-values of (tests suite)
-	    do (%run test)
-	    finally (setf suite-results result-list)))
-    (setf (status suite) (every (lambda (res)
-				  (typep res 'test-passed))
-				  suite-results))
-    (with-run-state (result-list)
-      (setf result-list (nconc result-list suite-results)))))
+    (flet ((run-tests ()
+             (loop
+                for test being the hash-values of (tests suite)
+                do (%run test))))
+      (unwind-protect
+           (bind-run-state ((result-list '()))
+             (unwind-protect
+                  (if (collect-profiling-info suite)
+                      (setf (profiling-info suite) (collect-timing #'run-tests))
+                      (run-tests)))
+             (setf suite-results result-list
+                   (status suite) (every (lambda (res)
+                                           (typep res 'test-passed))
+                                         suite-results)))
+        (with-run-state (result-list)
+          (setf result-list (nconc result-list suite-results)))))))
 
 (defmethod %run ((test-name symbol))
   (when-bind test (get-test test-name)
@@ -215,20 +225,21 @@ detailed-text-explainer with output going to *test-dribble*"
     (run! test-spec)))
 
 (defun run (test-spec)
-    "Run the test specified by TEST-SPEC.
+  "Run the test specified by TEST-SPEC.
 
 TEST-SPEC can be either a symbol naming a test or test suite, or
 a testable-object object. This function changes the operations
 performed by the !, !! and !!! functions."
-    (psetf *!* (lambda ()
-		 (loop for test being the hash-keys of *test*
-		    do (setf (status (get-test test)) :unknown))
-		 (bind-run-state ((result-list '()))
-		   (%run test-spec)
-		   result-list))
-	   *!!* *!*
-	   *!!!* *!!*)
-    (funcall *!*))
+  (psetf *!* (lambda ()
+               (loop for test being the hash-keys of *test*
+                     do (setf (status (get-test test)) :unknown))
+               (bind-run-state ((result-list '()))
+                 (with-simple-restart (explain "Ignore the rest of the tests and explain current results")
+                   (%run test-spec))
+                 result-list))
+         *!!* *!*
+         *!!!* *!!*)
+  (funcall *!*))
 
 (defun ! () 
   "Rerun the most recently run test and explain the results."