summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschulte.eric@gmail.com <schulte.eric@gmail.com>2013-12-13 09:34:35 -0700
committerEric Schulte <schulte.eric@gmail.com>2013-12-13 16:26:13 -0700
commit04eb8d7d85d156bfda6f24a5936492f9806b6fd8 (patch)
tree4e1e3cce8c0de00c1f210c994746ee85267fcf5d
parentfb09863fbb35bf15bcf78262b6e31b8b8b8617e7 (diff)
downloadorg-mode-04eb8d7d85d156bfda6f24a5936492f9806b6fd8.tar.gz
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.
-rw-r--r--Makefile1
-rw-r--r--mk/default.mk9
-rw-r--r--mk/targets.mk6
3 files changed, 13 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f95bcb2..ce06116 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/mk/default.mk b/mk/default.mk
index a1f42f8..a635f00 100644
--- a/mk/default.mk
+++ b/mk/default.mk
@@ -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 \
diff --git a/mk/targets.mk b/mk/targets.mk
index b753957..7ee81f6 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -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)