X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.lisp;h=0069333a3a4d2f7dcc56dac2c83d1f5f99a2946a;hb=ab5427d31da2bd95805cccc8e47b8f43d3dd606d;hp=92808c0eff482da2217789b5483725d062c0b949;hpb=4c81c652cdc32faefee1bccb84c3c9a7854e3edd;p=sbcl.git diff --git a/tests/run-tests.lisp b/tests/run-tests.lisp index 92808c0..0069333 100644 --- a/tests/run-tests.lisp +++ b/tests/run-tests.lisp @@ -43,33 +43,33 @@ (format t "Finished running tests.~%") (let ((skipcount 0)) (cond (*all-failures* - (format t "Status:~%") - (dolist (fail (reverse *all-failures*)) - (cond ((eq (car fail) :unhandled-error) - (format t " ~20a ~a~%" - "Unhandled error" - (enough-namestring (second fail)))) - ((eq (car fail) :invalid-exit-status) - (format t " ~20a ~a~%" - "Invalid exit status:" - (enough-namestring (second fail)))) - ((eq (car fail) :skipped-disabled) - (incf skipcount)) - (t - (format t " ~20a ~a / ~a~%" - (ecase (first fail) - (:expected-failure "Expected failure:") - (:unexpected-failure "Failure:") - (:unexpected-success "Unexpected success:") - (:skipped-broken "Skipped (broken):") - (:skipped-disabled "Skipped (irrelevant):")) - (enough-namestring (second fail)) - (third fail))))) - (when (> skipcount 0) - (format t " (~a tests skipped for this combination of platform and features)~%" - skipcount))) - (t - (format t "All tests succeeded~%"))))) + (format t "Status:~%") + (dolist (fail (reverse *all-failures*)) + (cond ((eq (car fail) :unhandled-error) + (format t " ~20a ~a~%" + "Unhandled error" + (enough-namestring (second fail)))) + ((eq (car fail) :invalid-exit-status) + (format t " ~20a ~a~%" + "Invalid exit status:" + (enough-namestring (second fail)))) + ((eq (car fail) :skipped-disabled) + (incf skipcount)) + (t + (format t " ~20a ~a / ~a~%" + (ecase (first fail) + (:expected-failure "Expected failure:") + (:unexpected-failure "Failure:") + (:unexpected-success "Unexpected success:") + (:skipped-broken "Skipped (broken):") + (:skipped-disabled "Skipped (irrelevant):")) + (enough-namestring (second fail)) + (third fail))))) + (when (> skipcount 0) + (format t " (~a tests skipped for this combination of platform and features)~%" + skipcount))) + (t + (format t "All tests succeeded~%"))))) (defun pure-runner (files test-fun) (format t "// Running pure tests (~a)~%" test-fun) @@ -174,8 +174,8 @@ (remove-if (lambda (x) (or (eq (car x) :expected-failure) (eq (car x) :unexpected-success) - (eq (car x) :skipped-broken) - (eq (car x) :skipped-disabled))) + (eq (car x) :skipped-broken) + (eq (car x) :skipped-disabled))) *all-failures*)) (defun setup-cl-user () @@ -200,6 +200,8 @@ (list (native-namestring ,file)) :environment (test-util::test-env) :output *error-output*))) + (let ((*failures* nil)) + (test-util:report-test-status)) (sb-ext:quit :unix-status (process-exit-code process)))) (defun accept-test-file (file)