ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move testing configuration into user-defined part, add hints 

* default.mk: move testing configuration $(BTEST_*) into
       user-defined part, add hints on what should go there. Some
       cosmetic fixes.
This commit is contained in:
Achim Gratz 2012-04-01 09:48:18 +02:00
parent 1751d2d7f9
commit b33a4d6be0
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
default.mk
View File

@ -19,26 +19,25 @@ datadir = $(prefix)/emacs/etc/org
# Where info files go. # Where info files go.
infodir = $(prefix)/info infodir = $(prefix)/info
# where to create temporary files for the testsuite # Where to create temporary files for the testsuite
TMPDIR ?= /tmp TMPDIR ?= /tmp
testdir = $(TMPDIR)/tmp-orgtest testdir = $(TMPDIR)/tmp-orgtest
# Configuration for testing
BTEST_PRE = # add options before standard load-path
BTEST_POST = # add options after standard load path
# -L <path-to>/ert # needed for Emacs23, Emacs24 has ert built in
# -L <path-to>/htmlize # need at least version 1.34 for source code formatting
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
BTEST_EXTRA = # extra packages to require for testing
##---------------------------------------------------------------------- ##----------------------------------------------------------------------
## YOU MAY NEED TO ADAPT THESE DEFINITIONS ## YOU MAY NEED TO ADAPT THESE DEFINITIONS
##---------------------------------------------------------------------- ##----------------------------------------------------------------------
# Using emacs in batch mode.
BATCH = $(EMACS) -batch -Q \
-L . \
--eval '(defconst org-release "$(ORGVERSION)-Make")' \
# How to run tests # How to run tests
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))' req-ob-lang = --eval '(require '"'"'ob-$(ob-lang))'
BTEST_EXTRA = # extra packages to require
req-extra = --eval '(require '"'"'$(req))' req-extra = --eval '(require '"'"'$(req))'
BTEST = $(EMACS) -batch -Q \ BTEST = $(EMACS) -batch -Q \
$(BTEST_PRE) -L lisp/ -L testing/ $(BTEST_POST) \ $(BTEST_PRE) -L lisp/ -L testing/ $(BTEST_POST) \
@ -49,6 +48,11 @@ BTEST = $(EMACS) -batch -Q \
--eval '(setq org-confirm-babel-evaluate nil)' \ --eval '(setq org-confirm-babel-evaluate nil)' \
-f org-test-run-batch-tests -f org-test-run-batch-tests
# Using emacs in batch mode.
BATCH = $(EMACS) -batch -Q \
-L . \
--eval '(defconst org-release "$(ORGVERSION)-Make")' \
# How to byte-compile the whole source directory # How to byte-compile the whole source directory
ELCDIR = $(BATCH) \ ELCDIR = $(BATCH) \
--eval '(batch-byte-recompile-directory 0)' --eval '(batch-byte-recompile-directory 0)'