Преглед изворни кода

Revert "added Makefile targets to check single tests"

This reverts commit 2c5251f0dab97a5101f15a5b574fdf66bbb71b6a.
Achim Gratz пре 11 година
родитељ
комит
9b6cff94aa
2 измењених фајлова са 4 додато и 8 уклоњено
  1. 2 1
      mk/default.mk
  2. 2 7
      mk/targets.mk

+ 2 - 1
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

+ 2 - 7
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