emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove vestigial reference to doom-module-table

Browse source
This commit is contained in:
Henrik Lissner 2018-06-10 17:48:48 +02:00
parent 400a4dafdb
commit 8d4971d02b
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

51
core/autoload/test.el
View file

@ -14,34 +14,33 @@ If neither is available, run all tests in all enabled modules."
(doom-initialize t) (doom-initialize t)
(doom-initialize-modules t)) (doom-initialize-modules t))
(condition-case-unless-debug ex (condition-case-unless-debug ex
(let* ((doom-modules (doom-module-table)) (let ((target-paths
(target-paths ;; Convert targets (either from MODULES or `argv') into a list of
;; Convert targets (either from MODULES or `argv') into a list of ;; string paths, pointing to the root directory of modules
;; string paths, pointing to the root directory of modules (cond ((stringp (car modules)) ; command line
(cond ((stringp (car modules)) ; command line (save-match-data
(save-match-data (cl-loop for arg in modules
(cl-loop for arg in modules if (string= arg ":core") collect doom-core-dir
if (string= arg ":core") collect doom-core-dir else if (string-match-p "/" arg)
else if (string-match-p "/" arg) nconc (cl-loop for dir in doom-modules-dirs
nconc (cl-loop for dir in doom-modules-dirs collect (expand-file-name arg dir))
collect (expand-file-name arg dir)) else
else nconc (cl-loop for dir in doom-modules-dirs
nconc (cl-loop for dir in doom-modules-dirs for path = (expand-file-name arg dir)
for path = (expand-file-name arg dir) if (file-directory-p path)
if (file-directory-p path) nconc
nconc (cl-remove-if-not
(cl-remove-if-not #'file-directory-p
#'file-directory-p (directory-files path t "^[^.]" t)))
(directory-files path t "^[^.]" t))) finally do (setq argv nil))))
finally do (setq argv nil))))
(modules ; cons-cells given to MODULES (modules ; cons-cells given to MODULES
(cl-loop for (module . submodule) in modules (cl-loop for (module . submodule) in modules
if (doom-module-locate-path module submodule) if (doom-module-locate-path module submodule)
collect it)) collect it))
((append (list doom-core-dir) ((append (list doom-core-dir)
(doom-module-load-path)))))) (doom-module-load-path))))))
;; Load all the unit test files... ;; Load all the unit test files...
(dolist (path target-paths) (dolist (path target-paths)
(let ((test-path (expand-file-name "test/" path))) (let ((test-path (expand-file-name "test/" path)))