Merge pull request #266 from phillord/feature/travis-update

Use EVM for travis, test recent Emacs

.travis.yml

@@ -1,15 +1,18 @@
 language: emacs-lisp
-before_install:
-  # PPA for stable Emacs packages
-  - sudo add-apt-repository -y ppa:cassou/emacs
-  # PPA for Emacs nightlies
-  - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa
-  # Update and install the Emacs for our environment
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq -yy ${EMACS}-nox ${EMACS}-el
+sudo: no
 env:
-  - EMACS=emacs23
-  - EMACS=emacs24
-  - EMACS=emacs-snapshot
+ - EVM_EMACS=emacs-24.1-travis
+ - EVM_EMACS=emacs-24.2-travis
+ - EVM_EMACS=emacs-24.3-travis
+ - EVM_EMACS=emacs-24.4-travis
+ - EVM_EMACS=emacs-24.5-travis
+ - EVM_EMACS=emacs-25.1-travis
+ - EVM_EMACS=emacs-25.2-travis
+ - EVM_EMACS=emacs-25.3-travis
+ - EVM_EMACS=emacs-26-pretest-travis
+ - EVM_EMACS=emacs-git-snapshot-travis
+install:
+  - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > travis.sh && source ./travis.sh
+  - evm install $EVM_EMACS --use --skip
 script:
   ./run-travis-ci.sh

dash.el

@@ -651,7 +651,8 @@ See also: `-last-item'."
   (declare (pure t) (side-effect-free t))
   (car (cdr (cdr (cdr (cdr list))))))
 
-;; TODO: emacs23 support, when dropped remove the condition
+;; TODO: gv was introduced in 24.3, so we can remove the if statement
+;; when support for earlier versions is dropped
 (eval-when-compile
   (require 'cl)
   (if (fboundp 'gv-define-simple-setter)
@@ -665,7 +666,8 @@ See also: `-last-item'."
   (declare (pure t) (side-effect-free t))
   (car (last list)))
 
-;; TODO: emacs23 support, when dropped remove the condition
+;; TODO: gv was introduced in 24.3, so we can remove the if statement
+;; when support for earlier versions is dropped
 (eval-when-compile
   (if (fboundp 'gv-define-setter)
       (gv-define-setter -last-item (val x) `(setcar (last ,x) ,val))

run-tests.sh

@@ -17,14 +17,17 @@ if [ -z "$ERT_SELECTOR" ] ; then
 fi
 
 $EMACS -batch \
-       $([[ $EMACS == "emacs23" ]] && echo -l dev/ert.el) \
        -l dash.el \
        -l dash-functional.el \
        -l dev/examples-to-tests.el \
        -l dev/examples.el \
        --eval "(ert-run-tests-batch-and-exit (quote ${ERT_SELECTOR}))"
 
-if [[ $EMACS != "emacs23" ]]; then
+VERSION=`$EMACS -version | head -1 | cut -d" " -f3`
+
+if [[ $VERSION == "24.1.1" ]] || [[ $VERSION == "24.2.1" ]] ; then
+    echo Skipping byte compile check for early Emacs version
+else
     $EMACS -Q --batch \
            --eval '(setq byte-compile-error-on-warn t)' \
            -f batch-byte-compile dash.el