Use Cask only for Emacs 24+

sachac · Feb 4, 2015 · 9d1769b · 9d1769b
1 parent f08e005
commit 9d1769b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,6 @@ before_install:
   # Update and install the Emacs for our environment
   - sudo apt-get update -qq
   - sudo apt-get install -qq -yy ${EMACS}-nox ${EMACS}-el
-  - 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=emacs23
   - EMACS=emacs24

diff --git a/dev/undercover-init.el b/dev/undercover-init.el
@@ -1,2 +1,2 @@
-(require 'undercover)
-(undercover "s.el")
+(when  (require 'undercover nil t)
+  (undercover "s.el"))
diff --git a/run-tests.sh b/run-tests.sh
@@ -4,4 +4,13 @@ if [ -z "$EMACS" ] ; then
     EMACS="emacs"
 fi
 
-cask exec $EMACS -batch -l dev/ert.el -l dev/examples-to-tests.el -l dev/undercover-init.el -l s.el -l dev/examples.el -f ert-run-tests-batch-and-exit
+if [ "$EMACS" == "emacs23" ]; then
+  $EMACS -batch -l dev/ert.el -l dev/examples-to-tests.el -l dev/undercover-init.el -l s.el -l dev/examples.el -f ert-run-tests-batch-and-exit
+else
+  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
+  cask exec $EMACS -batch -l dev/ert.el -l dev/examples-to-tests.el -l dev/undercover-init.el -l s.el -l dev/examples.el -f ert-run-tests-batch-and-exit
+fi
+