Skip to content

Commit

Permalink
dev: fix Makefile
Browse files Browse the repository at this point in the history
Get rid of vestigial reference to cask and fix 'make compile'.
  • Loading branch information
hlissner committed Oct 23, 2021
1 parent e9f39b9 commit 1bb8708
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.packages
*-autoloads.el
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@

all:
@cask
all: autoloads compile test

autoloads:
@emacs -batch \
--eval '(setq generated-autoload-file (expand-file-name "evil-multiedit-autoloads.el"))' \
-f batch-update-autoloads .

compile:
@emacs -batch -L . -f batch-byte-compile *.el
@emacs -batch -L . -l test/test-helper.el -f batch-byte-compile *.el

test:
@emacs -batch -L . -l test/test-helper.el test/*-test.el
@emacs -batch -L . -l test/test-helper.el -- test/*-test.el

clean:
@rm -vrf *.elc *-autoloads.el *~ test/.packages
Expand Down
22 changes: 12 additions & 10 deletions test/test-helper.el
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,17 @@
;;
;;; Bootstrap

(while command-line-args-left
(let ((regexp "\\.el\\'")
(path (expand-file-name (pop command-line-args-left))))
(if (file-directory-p path)
(setq command-line-args-left
(append (directory-files path nil regexp)
command-line-args-left))
(when (string-match-p regexp path)
(load path nil t)))))
(ert-run-tests-batch)
(let ((args (member "--" command-line-args-left)))
(when args
(while args
(let ((regexp "\\.el\\'")
(path (expand-file-name (pop args))))
(if (file-directory-p path)
(setq args
(append (directory-files path nil regexp)
args))
(when (string-match-p regexp path)
(load path nil t)))))
(ert-run-tests-batch)))

;;; test-helper.el ends here

0 comments on commit 1bb8708

Please sign in to comment.