aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2014-11-09 20:59:11 +0000
committerArtur Malabarba <bruce.connor.am@gmail.com>2014-11-09 20:59:11 +0000
commit5305686182f9e233d0c4d056eab9f28a40e3932c (patch)
tree259d002ee3a0e10ae782cc143b2ecb0cfa1ad259
parent19f077473848b498841efb5ea7e698a95dec6663 (diff)
parenta3788b8f4f1ae24c48fa2c6c85bd789e08a4293c (diff)
Merge pull request #35 from vermiculus/24.4-testing
Add 24.4 support
-rw-r--r--.travis.yml1
-rw-r--r--Makefile22
2 files changed, 19 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 63f0cb6..ae882b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env:
- EVM_EMACS=emacs-24.1-bin
- EVM_EMACS=emacs-24.2-bin
- EVM_EMACS=emacs-24.3-bin
+ - EVM_EMACS=emacs-24.4-bin
before_install:
- sudo mkdir /usr/local/evm
diff --git a/Makefile b/Makefile
index e812d5b..7b0b698 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
#
# To test Emacs 24.1, for example, use
#
-# make 24.1
+# make 1
#
# To test on all versions, of course, simply use
#
@@ -16,9 +16,23 @@
# make all
#
-all: 24.1 24.2 24.3
+VERSIONS = 1 2 3 4
-%:
- evm install emacs-$@-bin || true
+all :: $(VERSIONS)
+
+$(VERSIONS) ::
+ evm install emacs-24.$@-bin --skip || true
+ evm use emacs-24.$@-bin
emacs --version
+ cask install
emacs --batch -L . -l ert -l test/tests.el -f ert-run-tests-batch-and-exit
+
+install_cask:
+ curl -fsSkL https://raw.github.com/cask/cask/master/go | python
+
+install_evm:
+ curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash
+
+# Local Variables:
+# indent-tabs-mode: t
+# End: