branch: externals/assess
commit e9344a55df5e779dae92280a4c2edc8becf39f77
Author: Phillip Lord <phillip.l...@russet.org.uk>
Commit: Phillip Lord <phillip.l...@russet.org.uk>
Move from ert to assess-discover
---
.ert-runner | 1 -
Cask | 3 +--
Makefile | 19 +++++++++----------
assess-discover.el | 2 +-
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/.ert-runner b/.ert-runner
deleted file mode 100644
index 19825d5a80..0000000000
--- a/.ert-runner
+++ /dev/null
@@ -1 +0,0 @@
---load assess.el
\ No newline at end of file
diff --git a/Cask b/Cask
index 8e06f12332..8f926ba4fc 100644
--- a/Cask
+++ b/Cask
@@ -3,8 +3,7 @@
(package-file "assess.el")
-(files "assess*.el" "assess-doc.org")
+(files "assess*.el" "assess-*.el" "assess-doc.org")
(development
- (depends-on "ert-runner")
(depends-on "load-relative"))
diff --git a/Makefile b/Makefile
index c8281a855c..d0b39818b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,27 @@
-EMACS = emacs
+EMACS ?= emacs
CASK ?= cask
-#-include makefile-local
+-include makefile-local
ifdef EMACS
EMACS_ENV=EMACS=$(EMACS)
endif
-
all: install test
install:
- $(EMACS_ENV) cask install
-
-just-test:
- EMACS=$(EMACS) cask exec ert-runner
+ $(EMACS_ENV) $(CASK) install
test: install just-test
package:
- EMACS-$(EMACS) cask package
+ $(EMACS_ENV) $(CASK) package
-discover-test:
- EMACS=$(EMACS) cask exec $(EMACS) --batch -l assess.el -l
assess-discover.el -f assess-discover-run-and-exit-batch
+just-test:
+ $(EMACS_ENV) $(CASK) emacs --batch -q \
+ --directory=. \
+ --load assess-discover.el \
+ --funcall assess-discover-run-and-exit-batch
.PHONY: test dist
diff --git a/assess-discover.el b/assess-discover.el
index 4020d15bee..a9d0a2af29 100644
--- a/assess-discover.el
+++ b/assess-discover.el
@@ -31,7 +31,7 @@
(defun assess-discover-tests (directory)
"Discover tests in directory.
-Tests may confirm to one (and only one!) of several naming
+Tests must conform to one (and only one!) of several naming
schemes.
- End with -test.el
