make vanilla: run Emacs -Q with *this* Org loaded

This change should make it easier to run interactive tests or to
  reproduce problems with the current Org-mode loaded and without any
  personal config.
This commit is contained in:
schulte.eric@gmail.com 2013-12-13 09:34:35 -07:00 committed by Eric Schulte
parent fb09863fbb
commit 04eb8d7d85
3 changed files with 13 additions and 3 deletions

View File

@ -30,6 +30,7 @@ help helpall::
$(info make single - build Org ELisp files, single Emacs per source)
$(info make autoloads - create org-loaddefs.el to load Org in-place)
$(info make test - build Org ELisp files and run test suite)
$(info make vanilla - run Emacs with this Org-mode and no personal config)
helpall::
$(info make test-dirty - check without building first)
$(info make compile-dirty - build only stale Org ELisp files)

View File

@ -54,11 +54,12 @@ req-ob-lang = --eval '(require '"'"'ob-$(ob-lang))'
lst-ob-lang = ($(ob-lang) . t)
req-extra = --eval '(require '"'"'$(req))'
BTEST_RE ?= \\(org\\|ob\\)
BTEST = $(BATCH) \
BTEST_INIT = $(BATCH) \
$(BTEST_PRE) \
--eval '(add-to-list '"'"'load-path (concat default-directory "lisp"))' \
--eval '(add-to-list '"'"'load-path (concat default-directory "testing"))' \
$(BTEST_POST) \
$(BTEST_POST)
BTEST = $(BTEST_INIT) \
-l org-batch-test-init \
--eval '(setq \
org-batch-test t \
@ -72,6 +73,10 @@ BTEST = $(BATCH) \
$(foreach req,$(BTEST_EXTRA),$(req-extra)) \
--eval '(org-test-run-batch-tests org-test-select-re)'
# Running a plain emacs with no config and this Org-mode loaded. This
# should be useful for testing and for manually verrifying problems.
NOBATCH = $(filter-out -batch,$(BTEST_INIT)) -l org -f org-version
# Using emacs in batch mode.
# BATCH = $(EMACS) -batch -vanilla # XEmacs
BATCH = $(EMACS) -batch -Q \

View File

@ -31,7 +31,8 @@ endif
clean-install cleanelc cleandirs cleanaddcontrib \
cleanlisp cleandoc cleandocs cleantest \
compile compile-dirty uncompiled \
config config-test config-exe config-all config-eol config-version
config config-test config-exe config-all config-eol config-version \
vanilla
CONF_BASE = EMACS DESTDIR ORGCM ORG_MAKE_DOC
CONF_DEST = lispdir infodir datadir testdir
@ -94,6 +95,9 @@ compile compile-dirty::
all clean-install::
$(foreach dir, $(SUBDIRS), $(MAKE) -C $(dir) $@;)
vanilla:
$(NOBATCH) &
check test:: compile
check test test-dirty::
-$(MKDIR) $(testdir)