When compiling or otherwise building project test files, also load test-specific dependencies.

Author: doublep

eldev-build.el

@@ -381,12 +381,14 @@ This function may only be called while inside the body of a
   (unless eldev-normal-dependency-management
     (setf dont-touch-packages t))
   (unless dont-touch-packages
-    (let ((eldev-project-loading-mode 'as-is))
-      ;; FIXME: Is root injection actually needed here?  It will also be done from the
-      ;;        call to `eldev-build-find-targets' just a few lines below.
+    (let ((eldev-project-loading-mode 'as-is)
+          (extra-dependencies         '(build)))
       (when (memq 'test (eldev--effective-standard-filesets eldev-build-sets))
+        (push 'test extra-dependencies)
+        ;; FIXME: Is root injection actually needed here?  It will also be done from the
+        ;;        call to `eldev-build-find-targets' just a few lines below.
         (eldev--inject-loading-roots 'test))
-      (eldev-load-project-dependencies 'build nil t)))
+      (eldev-load-project-dependencies extra-dependencies nil t)))
   (let ((all-targets (apply #'eldev-build-find-targets (or eldev-build-sets '(main))))
         target-list
         target-fileset

test/compile.el

@@ -72,22 +72,34 @@
 
 (eldev-ert-defargtest eldev-compile-test-files-1 (everything)
                       (nil t)
-  (eldev--test-without-files "project-a" (:eval `(,@(when everything '("project-a.elc")) "test/project-a.elc"))
+  (eldev--test-without-files "project-a" ("project-a.elc" "test/project-a.elc")
     (eldev--test-run nil ("compile" "--set" (if everything "all" "test"))
       (eldev--test-assert-files project-dir preexisting-files (when everything "project-a.elc") "test/project-a.elc")
       (should (= exit-code 0)))))
 
 (eldev-ert-defargtest eldev-compile-test-files-2 (everything)
                       (nil t)
   ;; This project has an additional loading root for tests.
-  (eldev--test-without-files "project-g" (:eval `(,@(when everything '("project-g.elc" "project-g-util.elc"))
-                                                  "test/test-g-1.elc" "test/test-g-integration.elc" "test/test-g-util.elc"))
+  (eldev--test-without-files "project-g" ("project-g.elc" "project-g-util.elc"
+                                          "test/test-g-1.elc" "test/test-g-integration.elc" "test/test-g-util.elc")
     (eldev--test-run nil ("compile" "--set" (if everything "all" "test"))
       (eldev--test-assert-files project-dir preexisting-files
                                 (when everything '("project-g.elc" "project-g-util.elc"))
                                 "test/test-g-1.elc" "test/test-g-integration.elc" "test/test-g-util.elc")
       (should (= exit-code 0)))))
 
+(eldev-ert-defargtest eldev-compile-test-files-3 (everything)
+                      (nil t)
+  ;; This project has an additional dependency for tests.  It is needed not only to run,
+  ;; but also to compile them.
+  (eldev--test-without-files "project-j" ("project-j-autoloads.el" "project-j.elc" "project-j-advanced.elc"
+                                          "test/project-j.elc")
+    (eldev--test-run nil ("compile" "--set" (if everything "all" "test"))
+      (eldev--test-assert-files project-dir preexisting-files
+                                (when everything '("project-j-autoloads.el" "project-j.elc" "project-j-advanced.elc"))
+                                "test/project-j.elc")
+      (should (= exit-code 0)))))
+
 
 (ert-deftest eldev-compile-doesnt-load-when-not-asked-1 ()
   ;; `project-e-misc.el' is somewhat broken in that it cannot be

test/project-j/Eldev

@@ -1,3 +1,5 @@
 (eldev-use-package-archive `("archive-a" . ,(expand-file-name "../package-archive-a")))
 
 (eldev-use-plugin 'autoloads)
+
+(eldev-add-extra-dependencies 'test 'dependency-a)

test/project-j/test/project-j.el

@@ -0,0 +1,7 @@
+;; `dependency-a' is declared as an additional test-only dependency in this project's file `Eldev'.
+(require 'dependency-a)
+
+(ert-deftest project-j-test-dependency ()
+  (should (string= (dependency-a-hello) "Hello")))
+
+(provide 'test/project-j)

test/test.el

@@ -53,6 +53,14 @@
     (should (string-match-p "Ran 2 tests" stdout))
     (should (= exit-code 0))))
 
+(ert-deftest eldev-test-project-j-1 ()
+  ;; Only one passing test.  Most importantly, there is a test-only dependency in the
+  ;; project's file `Eldev' without which the test wouldn't run.
+  (eldev--test-run "project-j" ("test")
+    (should (string-match-p "passed.+project-j-test-dependency" stdout))
+    (should (string-match-p "Ran 1 test" stdout))
+    (should (= exit-code 0))))
+
 (eldev-ert-defargtest eldev-test-project-l-1 (loading-mode)
                       ('source 'byte-compiled 'packaged)
   ;; Project with special source directories.  One of the tests needs a resource located