[Emacs-diffs] feature/integrated-elpa 4b0cf9d 06/23: Various path hacks

[Phillip Lord]

branch: feature/integrated-elpa
commit 4b0cf9d44907d046348f3e2ab36821ea3c831747
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>

    Various path hacks
---
 Makefile.in              |    5 +++++
 packages/GNUmakefile     |    2 ++
 packages/package-test.el |   16 ++++++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3381387..4e83cb3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,6 +380,11 @@ src: lib-src
 # We need to build 'emacs' in 'src' to compile the *.elc files in 'lisp'.
 lisp: src
 
+# We should assume that all files in core are byte compiled before we
+# start to build packages. And we assume that src is build because we
+# need 'emacs'.
+packages: lisp src
+
 # These targets should be "${SUBDIR} without 'src'".
 lib lib-src lisp nt packages: Makefile
        $(MAKE) -C $@ all
diff --git a/packages/GNUmakefile b/packages/GNUmakefile
index 4a2aac6..21dfd12 100644
--- a/packages/GNUmakefile
+++ b/packages/GNUmakefile
@@ -7,6 +7,8 @@ EMACS=../src/emacs
 DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
 
 ## alas "all" is an ELPA package, so this is going to break
+all: build-all
+
 build-all: $(DIRS) $(EMACS)
 
 
diff --git a/packages/package-test.el b/packages/package-test.el
index c453f29..75bd07f 100644
--- a/packages/package-test.el
+++ b/packages/package-test.el
@@ -19,14 +19,14 @@ tests directory."
    (directory-files directory nil ".*-tests.el$")
    (directory-files directory nil "test-.*.el$")
    (let ((dir-test
-          (concat directory "test/")))
+          (concat directory "/test/")))
      (when (file-exists-p dir-test)
        (mapcar
         (lambda (file)
           (concat dir-test file))
         (directory-files dir-test nil ".*.el"))))
    (let ((dir-tests
-          (concat directory "tests/")))
+          (concat directory "/tests/")))
      (when (file-exists-p dir-tests)
        (mapcar
         (lambda (file)
@@ -34,9 +34,11 @@ tests directory."
         (directory-files dir-tests nil ".*.el"))))))
 
 (defun assess-discover--load-all-tests (directory)
-  (mapc
-   'load
-   (assess-discover-tests directory)))
+  (let ((loads
+         (assess-discover-tests directory)))
+    (mapc
+     'load
+     loads)))
 
 (defun assess-discover-load-tests ()
   (interactive)
@@ -52,5 +54,7 @@ tests directory."
   (assess-discover-run-and-exit-batch-dir default-directory))
 
 (defun assess-discover-run-and-exit-batch-dir (directory &optional selector)
-  (assess-discover--load-all-tests directory)
+  (assess-discover--load-all-tests
+   (concat default-directory
+           directory))
   (ert-run-tests-batch-and-exit selector))