change to be consistent with http://oremacs.com/2015/03/30/elisp-ert-travis/ because...

diff --git a/.travis.yml b/.travis.yml
index 1f94d838a6e61e57e343174e54ea3f548d870078..d51906fdee80d1b79fc9fbc006baef4536b23305 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,20 @@
 language: emacs-lisp
 language: emacs-lisp

+
+env:
+  matrix:
+    - emacs=emacs-snapshot
+

 before_install:
 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
   - 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 update -qq

-  - sudo apt-get install -qq -yy ${EMACS}-nox ${EMACS}-el
+  - sudo apt-get install -qq $emacs
+

   # Install cask dependencies
   - curl -fsSLo /tmp/cask-master.zip https://github.com/cask/cask/archive/master.zip
   - sudo unzip -qq -d /opt /tmp/cask-master.zip
   - sudo ln -sf /opt/cask-master/bin/cask /usr/local/bin/cask
   - cask
   # Install cask dependencies
   - curl -fsSLo /tmp/cask-master.zip https://github.com/cask/cask/archive/master.zip
   - sudo unzip -qq -d /opt /tmp/cask-master.zip
   - sudo ln -sf /opt/cask-master/bin/cask /usr/local/bin/cask
   - cask

-env:
-#  - EMACS=emacs24
-  - EMACS=emacs-snapshot
+

 script:
   - emacs --version
   - make test
\ No newline at end of file
 script:
   - emacs --version
   - make test
\ No newline at end of file

diff --git a/Makefile b/Makefile
index e2855ae7fdf5af6e3e5284cef59c1a27e7d39c22..8ec4b8e7428a154c5111c017f947d9ec769f26a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-EMACS ?= emacs
+emacs ?= emacs

 CASK ?= cask
 CASK_EXEC ?= ${CASK} exec
 EL_SOURCES = org-ref.el arxiv.el jmax-bibtex.el doi-utils.el isbn.el pubmed.el
 CASK ?= cask
 CASK_EXEC ?= ${CASK} exec
 EL_SOURCES = org-ref.el arxiv.el jmax-bibtex.el doi-utils.el isbn.el pubmed.el


@@ -10,10 +10,10 @@ test: clean-elc
        ${MAKE} unit
 
 unit:
        ${MAKE} unit
 
 unit:

-       ${CASK_EXEC} ${EMACS} -Q -batch -l org-ref.el -l org-ref-test.el --eval "(ert t)"
+       ${CASK_EXEC} ${emacs} -Q -batch -l org-ref.el -l org-ref-test.el --eval "(ert t)"

 
 compile:
 
 compile:

-       ${CASK_EXEC} ${EMACS} -Q -batch -f batch-byte-compile *.el
+       ${CASK_EXEC} ${emacs} -Q -batch -f batch-byte-compile *.el

 
 clean-elc:
        rm -f *.elc
 
 clean-elc:
        rm -f *.elc