mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit c43b13f00bb27045e617ae7618085fde96ff495e Author: Matthew L. Fidler <[email protected]> Date: Wed Jun 18 14:03:24 2014 -0500 Remove ert dependence. Its in emacs 24 --- Makefile | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 6a60530..a65a8fe 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,6 @@ WORK_DIR=$(subst $(BACKSLASH),$(SLASH),$(TMP1)) PACKAGE_NAME=$(shell basename $(TMP1)) AUTOLOADS_FILE=$(PACKAGE_NAME)-autoloads.el TRAVIS_FILE=.travis.yml -TEST_DIR=$(WORK_DIR) -TEST_DEP_1=ert -TEST_DEP_1_STABLE_URL=http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/emacs-lisp/ert.el?h=emacs-24.3 -TEST_DEP_1_LATEST_URL=http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/emacs-lisp/ert.el?h=master .PHONY : build downloads downloads-latest autoloads test-autoloads test-travis \ test test-interactive clean edit test-dep-1 test-dep-2 test-dep-3 \ @@ -29,17 +25,6 @@ build : (setq byte-compile-error-on-warn t) \ (batch-byte-compile))" *.el -test-dep-1 : - @cd $(TEST_DIR) && \ - $(EMACS) $(EMACS_BATCH) -L . -L .. -l $(TEST_DEP_1) || \ - (echo "Can't load test dependency $(TEST_DEP_1).el, run 'make downloads' to fetch it" ; exit 1) - -downloads : - $(CURL) '$(TEST_DEP_1_STABLE_URL)' > $(TEST_DIR)/$(TEST_DEP_1).el - -downloads-latest : - $(CURL) '$(TEST_DEP_1_LATEST_URL)' > $(TEST_DIR)/$(TEST_DEP_1).el - autoloads : @cd $(WORK_DIR) $(EMACS) $(EMACS_BATCH) --eval \ @@ -55,8 +40,7 @@ test-travis : @if test -z "$$TRAVIS" && test -e $(TRAVIS_FILE); then travis-lint $(TRAVIS_FILE); fi test : build test-dep-1 test-autoloads - @cd $(TEST_DIR) && \ - $(EMACS) $(EMACS_BATCH) -L . -L .. -L $(TEST_DIR) -l cl -l $(TEST_DEP_1) -l ergoemacs-mode -l ergoemacs-test --eval \ + $(EMACS) $(EMACS_BATCH) -L . -L .. -l cl -l ergoemacs-mode -l ergoemacs-test --eval \ "(progn \ (fset 'ert--print-backtrace 'ignore) \ (ert-run-tests-batch-and-exit '(and \"$(TESTS)\" (not (tag :interactive)))))" || exit 1; \
