From 72d7c95469cdb5fd403de53215fb4df012e08339 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 4 Mar 2012 12:07:44 +0100 Subject: [PATCH] initialize Babel languages and provide possibility to load extra packages for testing * default.mk: Run emacs without a site-file. BTEST_EXTRA redefined to hold names of extra packages to require for testing. BTEST_PRE and BTEST_POST allow additional options to be injected around setup of standard load path for testing. BTEST_OB_LANGUAGES holds the names of Babel languages to required. R is not added to the list since it requires ess to be installed and configured. All variables can be overridden in local.mk as before. --- default.mk | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/default.mk b/default.mk index 961e659da..9d4052ceb 100644 --- a/default.mk +++ b/default.mk @@ -33,13 +33,20 @@ BATCH = $(EMACS) -batch -Q \ --eval '(defconst org-release "$(ORGVERSION)-Make")' \ # How to run tests -BTEST_EXTRA = # placeholder -BTEST = $(EMACS) -batch \ - $(BTEST_EXTRA) \ - -L lisp/ \ +BTEST_PRE = # add options before standard load-path +BTEST_POST = # add options after standard load path +BTEST_OB_LANGUAGES = awk C fortran maxima lilypond octave python sh # R +# R is not activated by default because it requires ess to be installed and configured +req-ob-lang = --eval '(require '"'"'ob-$(ob-lang))' +BTEST_EXTRA = # extra packages to require +req-extra = --eval '(require '"'"'$(req))' +BTEST = $(EMACS) -batch -Q \ + $(BTEST_PRE) -L lisp/ -L testing/ $(BTEST_POST) \ --eval '(defconst org-release "$(ORGVERSION)-Test")' \ -l testing/org-test.el \ - -eval "(setq org-confirm-babel-evaluate nil)" \ + $(foreach ob-lang,$(BTEST_OB_LANGUAGES),$(req-ob-lang)) \ + $(foreach req,$(BTEST_EXTRA),$(req-extra)) \ + --eval '(setq org-confirm-babel-evaluate nil)' \ -f org-test-run-batch-tests # How to byte-compile the whole source directory -- 2.11.4.GIT