mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

Print test timings unconditionally

Browse Source 
* lisp/emacs-lisp/ert.el (ert-batch-print-duration): Remove.
(ert-run-tests-batch): Adapt accordingly.

* test/Makefile.in:
* test/README: Remove TEST_PRINT_TEST_DURATION.
This commit is contained in:
Michael Albinus 2018-03-17 10:25:22 +01:00
parent 1c7db8aa30
commit bcec2a8a39
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/emacs-lisp/ert.el
View File

@ -1342,9 +1342,6 @@ RESULT must be an `ert-test-result-with-condition'."
(defvar ert-quiet nil
"Non-nil makes ERT only print important information in batch mode.")
(defvar ert-batch-print-duration nil
"Non-nil makes ERT print duration time of single tests in batch mode.")
;;;###autoload
(defun ert-run-tests-batch (&optional selector)
"Run the tests specified by SELECTOR, printing results to the terminal.
@ -1371,7 +1368,7 @@ Returns the stats object."
(let ((unexpected (ert-stats-completed-unexpected stats))
(skipped (ert-stats-skipped stats))
(expected-failures (ert--stats-failed-expected stats)))
(message "\n%sRan %s tests, %s results as expected%s%s (%s)%s\n"
(message "\n%sRan %s tests, %s results as expected%s%s (%s, %f sec)%s\n"
(if (not abortedp)
""
"Aborted: ")
@ -1383,15 +1380,11 @@ Returns the stats object."
(if (zerop skipped)
""
(format ", %s skipped" skipped))
(if ert-batch-print-duration
(format
"%s, %f sec"
(ert--format-time-iso8601 (ert--stats-end-time stats))
(float-time
(time-subtract
(ert--stats-end-time stats)
(ert--stats-start-time stats))))
(ert--format-time-iso8601 (ert--stats-end-time stats)))
(ert--format-time-iso8601 (ert--stats-end-time stats))
(float-time
(time-subtract
(ert--stats-end-time stats)
(ert--stats-start-time stats)))
(if (zerop expected-failures)
""
(format "\n%s expected failures" expected-failures)))
@ -1463,17 +1456,14 @@ Returns the stats object."
(let* ((max (prin1-to-string (length (ert--stats-tests stats))))
(format-string (concat "%9s %"
(prin1-to-string (length max))
"s/" max " %S"
(if ert-batch-print-duration
" (%f sec)"))))
"s/" max " %S (%f sec)")))
(message format-string
(ert-string-for-test-result result
(ert-test-result-expected-p
test result))
(1+ (ert--stats-test-pos stats test))
(ert-test-name test)
(if ert-batch-print-duration
(ert-test-result-duration result)))))))))
(ert-test-result-duration result))))))))
nil))
;;;###autoload

5
test/Makefile.in
View File

@ -111,11 +111,6 @@ ifneq (${TEST_BACKTRACE_LINE_LENGTH},)
ert_opts += --eval '(setq ert-batch-backtrace-right-margin ${TEST_BACKTRACE_LINE_LENGTH})'
endif
# Whether the tests shall also report their duration.
ifdef TEST_PRINT_TEST_DURATION
ert_opts += --eval '(setq ert-batch-print-duration t)'
endif
ifeq (@HAVE_MODULES@, yes)
MODULES_EMACSOPT := --module-assertions
else

5
test/README
View File

@ -65,11 +65,6 @@ compiled version of a test use
make TEST_LOAD_EL=no ...
Sometimes, it is necessary to trace the duration time for single tests.
This is controlled by the environment variable TEST_PRINT_TEST_DURATION
make TEST_PRINT_TEST_DURATION=1 ...
(Also, see etc/compilation.txt for compilation mode font lock tests.)