branch: elpa/evil-goggles
commit d4b3d873dc855829e51e4433c812b856771d77bd
Author: Evgeni Kolev <[email protected]>
Commit: Evgeni Kolev <[email protected]>
Update CI setup to run evil's tests unaltered
---
.travis.yml | 32 ++++++++++++++++++++------------
Makefile | 4 ----
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 67d51dac26..fd72ae8386 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,25 @@
-sudo: true
-dist: precise
-language: emacs-lisp
+sudo: false
+language: generic
env:
+ global:
+ - CURL="curl -fsSkL --retry 9 --retry-delay 9"
matrix:
- - emacs=emacs-snapshot
+ - EMACS_VERSION=25.2
-before_install:
- - sudo add-apt-repository -y ppa:ubuntu-elisp
- - sudo apt-get update -qq
- - sudo apt-get install -qq $emacs
+addons:
+ apt:
+ packages:
+ - aspell
+ - aspell-en
+
+install:
+ - $CURL -O
https://github.com/npostavs/emacs-travis/releases/download/bins/emacs-bin-${EMACS_VERSION}.tar.gz
+ - tar -xaf emacs-bin-${EMACS_VERSION}.tar.gz -C /
+ - export EMACS=/tmp/emacs/bin/emacs
+ - $EMACS --version
script:
- - make update
- - make compile
- - make test
- - make evil-test-batch
+ - emacs=$EMACS make update
+ - emacs=$EMACS make compile
+ - emacs=$EMACS make test
+ - emacs=$EMACS make evil-test
diff --git a/Makefile b/Makefile
index ed56363bae..b3bd13a4be 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,8 @@ clean:
checkdoc:
$(bemacs) -l test/make-checkdoc.el
-# wget evil-tests.el and comment out evil-test-command-window* and
-# evil-test-jump tests which fail under emacs -batch;
-# NOTE: the sed command doesn't work on BSD sed
test/evil-tests.el:
curl -s
"https://raw.githubusercontent.com/emacs-evil/evil/49965280b97d7ba8b913f4bf6ff86662e2263c4e/evil-tests.el";
--output test/evil-tests.el
- sed -i '7471,7571{s/./;; &/}; 8080,8125{s/./;; &/}' test/evil-tests.el
evil-test: test/evil-tests.el
$(emacs) -nw -Q -l test/elpa.el -l test/make-evil-test.el
