[nongnu] elpa/popup a73a3b1 104/184: Fix for using cask

[ELPA Syncer]

branch: elpa/popup
commit a73a3b16d51de3df267fe40ffe8d6fcb56a5aed6
Author: Syohei YOSHIDA <syohex@gmail.com>
Commit: Syohei YOSHIDA <syohex@gmail.com>

    Fix for using cask
---
 .travis.yml       | 24 ++++++++++++++----------
 Makefile          | 25 ++++++++++++++-----------
 tests/run-test.el | 14 ++------------
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1a07d7c..abed12f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,19 @@
 language: emacs-lisp
+env:
+  matrix:
+    - EMACS=emacs24
+    - EMACS=emacs-snapshot
+  global:
+    - CASK=$HOME/.cask/bin/cask
 before_install:
-  - git submodule update --init
-  - make tests/cl-lib.el
+  - sudo add-apt-repository -y ppa:cassou/emacs
+  - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq $EMACS
   - if [ "$EMACS" = 'emacs-snapshot' ]; then
-      sudo add-apt-repository -y ppa:cassou/emacs &&
-      sudo apt-get update -qq &&
-      sudo apt-get install -qq
-          emacs-snapshot-el emacs-snapshot-gtk emacs-snapshot;
+      sudo apt-get install -qq emacs-snapshot-el emacs-snapshot-nox;
     fi
-env:
-  - EMACS=emacs
-  - EMACS=emacs-snapshot
+  - curl -fsSkL --max-time 10 --retry 10 --retry-delay 10
+        https://raw.github.com/cask/cask/master/go | python
 script:
-  make travis-ci EMACS=$EMACS
+  make travis-ci
diff --git a/Makefile b/Makefile
index 4fea1d4..6c7c3bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,28 @@
-EMACS=emacs
+EMACS ?= emacs
+CASK ?= cask
 EMACS23=emacs23
 
+ELPA_DIR = \
+       .cask/$(shell $(EMACS) -Q --batch --eval '(princ emacs-version)')/elpa
+
 .PHONY: test test-nw test-emacs23 test-emacs23-nw travis-ci
 
 test:
-       ${EMACS} -Q -L . -l tests/run-test.el
+       $(CASK) exec $(EMACS) -Q -L . -l tests/run-test.el
 
 test-nw:
-       ${EMACS} -Q -nw -L . -l tests/run-test.el
+       $(CASK) exec $(EMACS) -Q -nw -L . -l tests/run-test.el
 
 test-emacs23: tests/ert.el
        ${EMACS23} -Q -L . -l test/ert.el -l tests/run-test.el
 
 test-emacs23-nw: tests/ert.el
-       ${EMACS23} -Q -nw -L . -l test/ert.el -l tests/run-test.el
-
-travis-ci:
-       ${EMACS} -batch -Q -l tests/run-test.el
+       $(EMACS23) -Q -nw -L . -l test/ert.el -l tests/run-test.el
 
-tests/ert.el:
-       wget 
"http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/emacs-lisp/ert.el"; -O $@
+travis-ci: elpa
+       $(CASK) exec $(EMACS) -batch -Q -l tests/run-test.el
 
-tests/cl-lib.el:
-       wget "http://elpa.gnu.org/packages/cl-lib-0.3.el"; -O $@
+elpa: $(ELPA_DIR)
+$(ELPA_DIR): Cask
+       $(CASK) install
+       touch $@
diff --git a/tests/run-test.el b/tests/run-test.el
index 4cb8022..fce1fe2 100644
--- a/tests/run-test.el
+++ b/tests/run-test.el
@@ -1,7 +1,7 @@
 ;; Usage:
 ;;
-;;   emacs -Q -l tests/run-test.el           # interactive mode
-;;   emacs -batch -Q -l tests/run-test.el    # batch mode
+;;   cask exec emacs -Q -l tests/run-test.el           # interactive mode
+;;   cask exec emacs -batch -Q -l tests/run-test.el    # batch mode
 
 
 ;; Utils
@@ -22,16 +22,6 @@
       (list popup-test-dir
             popup-root-dir))
 
-
-;; Use ERT from github when this Emacs does not have it
-(unless (locate-library "ert")
-  (add-to-list
-   'load-path
-   (popup-test-join-path popup-root-dir "lib" "ert" "lisp" "emacs-lisp"))
-  (require 'ert-batch)
-  (require 'ert-ui))
-
-
 ;; Load tests
 (load "popup-test")