summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2012-04-01 09:48:18 +0200
committerAchim Gratz <Stromeko@Stromeko.DE>2012-04-20 21:04:14 +0200
commitb33a4d6be040febccd8a1fad6a36a941c53619a4 (patch)
treea3d0c23ee2b27960622ed12f719cff4aaa75abae
parent1751d2d7f9779ad33d21941887aa90ef5f7e9449 (diff)
downloadorg-mode-b33a4d6be040febccd8a1fad6a36a941c53619a4.tar.gz
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.
-rw-r--r--default.mk26
1 files changed, 15 insertions, 11 deletions
diff --git a/default.mk b/default.mk
index 9d4052c..45e6fbf 100644
--- a/default.mk
+++ b/default.mk
@@ -19,26 +19,25 @@ datadir = $(prefix)/emacs/etc/org
# Where info files go.
infodir = $(prefix)/info
-# where to create temporary files for the testsuite
+# Where to create temporary files for the testsuite
TMPDIR ?= /tmp
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
##----------------------------------------------------------------------
-# Using emacs in batch mode.
-BATCH = $(EMACS) -batch -Q \
- -L . \
- --eval '(defconst org-release "$(ORGVERSION)-Make")' \
-
# 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))'
-BTEST_EXTRA = # extra packages to require
req-extra = --eval '(require '"'"'$(req))'
BTEST = $(EMACS) -batch -Q \
$(BTEST_PRE) -L lisp/ -L testing/ $(BTEST_POST) \
@@ -49,6 +48,11 @@ BTEST = $(EMACS) -batch -Q \
--eval '(setq org-confirm-babel-evaluate nil)' \
-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
ELCDIR = $(BATCH) \
--eval '(batch-byte-recompile-directory 0)'