Merge branch 'debt'

[gnu-emacs-elpa] / Makefile

diff --git a/Makefile b/Makefile
index 0b5c237819e19a0382b93079fb6244a9338ae4f9..f729409b9c8d4741e254d0cc2f86193618d49435 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-CASK = cask
 EMACS = emacs
+CASK = EMACS=${EMACS} cask
 DEPENDENCIES = .cask/
-SCOPIFIER_PORT = $$(lsof -t -i:6969)
-KILL_SCOPIFIER = if [ -n "${SCOPIFIER_PORT}" ]; then kill ${SCOPIFIER_PORT}; fi
 
 all: uncompile compile test
 
@@ -28,22 +26,18 @@ ${DEPENDENCIES}:
        ${CASK}
 
 test: ${DEPENDENCIES}
-       ${KILL_SCOPIFIER}
        ${CASK} exec ${EMACS} -Q -batch \
        -L . \
        -l ert \
-       -l ert-async \
        -l test/context-coloring-coverage.el \
        -f context-coloring-coverage-ci-init \
        -l test/context-coloring-test.el \
        -f ert-run-tests-batch-and-exit
 
 cover: ${DEPENDENCIES}
-       ${KILL_SCOPIFIER}
        ${CASK} exec ${EMACS} -Q -batch \
        -L . \
        -l ert \
-       -l ert-async \
        -l test/context-coloring-coverage.el \
        -f context-coloring-coverage-local-init \
        -l test/context-coloring-test.el \