summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2013-11-05 18:50:06 +0100
committerAchim Gratz <Stromeko@Stromeko.DE>2013-11-23 19:29:34 +0100
commit9b6cff94aa84eaa3fcf155ff0caf861408c57095 (patch)
tree8f10b16979e56dcb05869a8129c4fbedab8d0974
parent1f498c93f297cf39f9afc609433eb764c1480f9e (diff)
downloadorg-mode-9b6cff94aa84eaa3fcf155ff0caf861408c57095.tar.gz
Revert "added Makefile targets to check single tests"
This reverts commit 2c5251f0dab97a5101f15a5b574fdf66bbb71b6a.
-rw-r--r--mk/default.mk3
-rw-r--r--mk/targets.mk9
2 files changed, 4 insertions, 8 deletions
diff --git a/mk/default.mk b/mk/default.mk
index 5cb75c3..a39ecec 100644
--- a/mk/default.mk
+++ b/mk/default.mk
@@ -60,7 +60,8 @@ BTEST = $(BATCH) \
-l testing/org-test.el \
$(foreach ob-lang,$(BTEST_OB_LANGUAGES),$(req-ob-lang)) \
$(foreach req,$(BTEST_EXTRA),$(req-extra)) \
- --eval '(setq org-confirm-babel-evaluate nil)'
+ --eval '(setq org-confirm-babel-evaluate nil)' \
+ -f org-test-run-batch-tests
# Using emacs in batch mode.
# BATCH = $(EMACS) -batch -vanilla # XEmacs
diff --git a/mk/targets.mk b/mk/targets.mk
index cc4e032..aef11eb 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -94,15 +94,10 @@ compile compile-dirty::
all clean-install::
$(foreach dir, $(SUBDIRS), $(MAKE) -C $(dir) $@;)
-check test single-test:: compile
+check test:: compile
check test test-dirty::
-$(MKDIR) $(testdir)
- TMPDIR=$(testdir) $(BTEST) -f org-test-run-batch-tests
-
-single-test single-test-dirty::
- -$(MKDIR) $(testdir)
- TMPDIR=$(testdir) $(BTEST) --eval "(org-test-load)" --eval "(ert '$(TEST))"
-
+ TMPDIR=$(testdir) $(BTEST)
ifeq ($(TEST_NO_AUTOCLEAN),) # define this variable to leave $(testdir) around for inspection
$(MAKE) cleantest
endif