projects
/
fiveam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix modelines
[fiveam.git]
/
src
/
run.lisp
diff --git
a/src/run.lisp
b/src/run.lisp
index
0ebc771
..
c5020fb
100644
(file)
--- a/
src/run.lisp
+++ b/
src/run.lisp
@@
-1,6
+1,6
@@
-;; -*- lisp -*-
+;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*-
-(in-package :it.bese.FiveAM)
+(in-package :it.bese.fiveam)
;;;; * Running Tests
;;;; * Running Tests
@@
-89,6
+89,8
@@
run."))
(setf (status test) :circular))))
(t (status test))))
(setf (status test) :circular))))
(t (status test))))
+(defgeneric resolve-dependencies (depends-on))
+
(defmethod resolve-dependencies ((depends-on symbol))
"A test which depends on a symbol is interpreted as `(AND
,DEPENDS-ON)."
(defmethod resolve-dependencies ((depends-on symbol))
"A test which depends on a symbol is interpreted as `(AND
,DEPENDS-ON)."
@@
-128,6
+130,8
@@
run."))
(funcall test-lambda)
result-list))
(funcall test-lambda)
result-list))
+(defgeneric run-test-lambda (test))
+
(defmethod run-test-lambda ((test test-case))
(with-run-state (result-list)
(bind-run-state ((current-test test))
(defmethod run-test-lambda ((test test-case))
(with-run-state (result-list)
(bind-run-state ((current-test test))
@@
-154,8
+158,9
@@
run."))
(let ((*readtable* (copy-readtable))
(*package* (runtime-package test)))
(if (collect-profiling-info test)
(let ((*readtable* (copy-readtable))
(*package* (runtime-package test)))
(if (collect-profiling-info test)
- (setf (profiling-info test)
- (arnesi:collect-timing (test-lambda test)))
+ ;; Timing info doesn't get collected ATM, we need a portable library
+ ;; (setf (profiling-info test) (collect-timing (test-lambda test)))
+ (funcall (test-lambda test))
(funcall (test-lambda test))))
(retest ()
:report (lambda (stream)
(funcall (test-lambda test))))
(retest ()
:report (lambda (stream)
@@
-192,7
+197,9
@@
run."))
(bind-run-state ((result-list '()))
(unwind-protect
(if (collect-profiling-info suite)
(bind-run-state ((result-list '()))
(unwind-protect
(if (collect-profiling-info suite)
- (setf (profiling-info suite) (collect-timing #'run-tests))
+ ;; Timing info doesn't get collected ATM, we need a portable library
+ ;; (setf (profiling-info suite) (collect-timing #'run-tests))
+ (run-tests)
(run-tests)))
(setf suite-results result-list
(status suite) (every (lambda (res)
(run-tests)))
(setf suite-results result-list
(status suite) (every (lambda (res)
@@
-202,7
+209,7
@@
run."))
(setf result-list (nconc result-list suite-results)))))))
(defmethod %run ((test-name symbol))
(setf result-list (nconc result-list suite-results)))))))
(defmethod %run ((test-name symbol))
- (when-bind test (get-test test-name)
+ (when-let (test (get-test test-name))
(%run test)))
(defvar *initial-!* (lambda () (format t "Haven't run that many tests yet.~%")))
(%run test)))
(defvar *initial-!* (lambda () (format t "Haven't run that many tests yet.~%")))