[elpa] externals/bnf-mode 4ba8d28 14/36: Load undercover first to improve coverage report

[Stefan Monnier]

branch: externals/bnf-mode
commit 4ba8d288db09342ae9f875abba484a195eee915a
Author: Serghei Iakovlev <egrep@protonmail.ch>
Commit: Serghei Iakovlev <egrep@protonmail.ch>

    Load undercover first to improve coverage report
---
 .codecov.yml                    |  2 +-
 test/test-bnf-mode-font-lock.el | 14 +++++++++++---
 test/utils.el                   | 10 ----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.codecov.yml b/.codecov.yml
index 90afaf3..a7ca5be 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -49,4 +49,4 @@ ignore:
   # ignore folders and all its contents
   - ".cask/.*"
   - ".github/.*"
-  - "test/.*"
+  - "test/test-.*"
diff --git a/test/test-bnf-mode-font-lock.el b/test/test-bnf-mode-font-lock.el
index 2bdb38b..046ef63 100644
--- a/test/test-bnf-mode-font-lock.el
+++ b/test/test-bnf-mode-font-lock.el
@@ -29,9 +29,17 @@
 ;;; Code:
 
 (require 'buttercup)
-(load (concat (file-name-directory (or load-file-name (buffer-file-name)
-                                       default-directory))
-              "utils.el") nil 'nomessage 'nosuffix)
+
+(when (require 'undercover nil t)
+  ;; Track coverage, but don't send to coverage serivice.  Save in parent
+  ;; directory as undercover saves paths relative to the repository root.
+  (undercover "*.el" "test/utils.el"
+              (:report-file "coverage-final.json")
+              (:send-report nil)))
+
+(let* ((current-dir (file-name-directory (or load-file-name (buffer-file-name)
+                                             default-directory))))
+  (load (concat current-dir "utils.el") nil 'nomessage 'nosuffix))
 
 
 ;;;; Tests
diff --git a/test/utils.el b/test/utils.el
index 9d8ace7..8ef5e69 100644
--- a/test/utils.el
+++ b/test/utils.el
@@ -31,16 +31,6 @@
 (require 'buttercup)
 (require 'cl-lib)    ; `cl-defmacro'
 
-;; Make sure the exact Emacs version can be found in the build output
-(message "Running tests on Emacs %s" emacs-version)
-
-(when (require 'undercover nil t)
-  ;; Track coverage, but don't send to coverage serivice.  Save in parent
-  ;; directory as undercover saves paths relative to the repository root.
-  (undercover "*.el"
-              (:report-file "coverage-final.json")
-              (:send-report nil)))
-
 (let* ((current-file (if load-in-progress load-file-name (buffer-file-name)))
        (source-directory (locate-dominating-file current-file "Cask"))
        ;; Don't load old byte-compiled versions