Port over evil-magit

1 files changed, 23 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index d436604..381885c 100755
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,21 @@
 EMACS ?= emacs
+CASK ?= cask
+
+LOADPATH = -L .
+TESTPATH = -L ./test
+
+ELPA_DIR = \
+	.cask/$(shell $(EMACS) -Q --batch --eval '(princ emacs-version)')/elpa
 
 compile:
-	cask exec $(EMACS) -Q -batch			\
+	$(CASK) exec $(EMACS) -Q -batch			\
 	-L .						\
 	--eval '(setq evil-want-integration nil)'	\
 	--eval '(setq byte-compile-error-on-warn t)'	\
 	-f batch-byte-compile *.el modes/*/*.el
 
 lint:
-	cask exec $(EMACS) -Q -batch							\
+	$(CASK) exec $(EMACS) -Q -batch							\
 	--eval "(require 'package)"							\
 	--eval "(push '(\"melpa\" . \"http://melpa.org/packages/\") package-archives)"	\
 	--eval "(package-initialize)"							\
@@ -18,7 +25,18 @@ lint:
 	--eval "(advice-add 'package-lint--check-version-regexp-list :around 'ignore)" \
 	-f package-lint-batch-and-exit *.el modes/*/*.el
 
-test:
-	cask exec ert-runner
+test: elpa
+	$(CASK) exec $(EMACS) -Q -batch $(LOADPATH) $(TESTPATH) \
+-l evil-collection-test.el -l evil-collection-magit-tests.el -f ert-run-tests-batch-and-exit
+
+magit-test: elpa
+	$(CASK) exec $(EMACS) -Q -batch $(LOADPATH) $(TESTPATH) \
+-l evil-collection-magit-tests.el -f ert-run-tests-batch-and-exit
+
+elpa: $(ELPA_DIR)
+$(ELPA_DIR): Cask
+	$(CASK) install
+	mkdir -p $(ELPA_DIR)
+	touch $@
 
-.PHONY: compile lint test
+.PHONY: compile lint test elpa