aboutsummaryrefslogtreecommitdiffstats
path: root/test/Makefile.in
diff options
context:
space:
mode:
authorNoam Postavsky2018-06-06 21:25:52 -0400
committerNoam Postavsky2018-06-12 07:26:06 -0400
commit5bdc344780faabbc91b7e55306b2071dffb44fa2 (patch)
tree675856e8329dbd3bb77afd86e166869bbbcc7ce6 /test/Makefile.in
parentb6b793bd77cb8be0a2d2745262e53037dc6798a0 (diff)
downloademacs-5bdc344780faabbc91b7e55306b2071dffb44fa2.tar.gz
emacs-5bdc344780faabbc91b7e55306b2071dffb44fa2.zip
; Reduce quoting for SELECTOR in 'make -C test' (Bug#31744)
Before: make -C test SELECTOR='\"foo\"' make -C test SELECTOR='(quote (tag :some-tag))' After: make -C test SELECTOR='"foo"' make -C test SELECTOR='(tag :some-tag)' * test/Makefile.in: Use single quotes around the command line call to ert, this means the user doesn't have to backslash escape double quotes when writing lisp strings for the selector. Also wrap the SELECTOR value in (quote ...) so the user won't have to type it in (and not get tempted to use the '... reader syntax form which would now fail to work due to using single quotes around the whole shell arg). * test/README: Update instructions accordingly.
Diffstat (limited to 'test/Makefile.in')
-rw-r--r--test/Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 451513a7474..597ef913113 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -98,9 +98,9 @@ TEST_LOCALE = C
98TEST_INTERACTIVE ?= no 98TEST_INTERACTIVE ?= no
99 99
100ifeq ($(TEST_INTERACTIVE),yes) 100ifeq ($(TEST_INTERACTIVE),yes)
101TEST_RUN_ERT = --eval "(ert ${SELECTOR_ACTUAL})" 101TEST_RUN_ERT = --eval '(ert (quote ${SELECTOR_ACTUAL}))'
102else 102else
103TEST_RUN_ERT = --batch --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG} 103TEST_RUN_ERT = --batch --eval '(ert-run-tests-batch-and-exit (quote ${SELECTOR_ACTUAL}))' ${WRITE_LOG}
104endif 104endif
105 105
106# Whether to run tests from .el files in preference to .elc, we do 106# Whether to run tests from .el files in preference to .elc, we do
@@ -140,8 +140,8 @@ test_module_dir := $(srcdir)/data/emacs-module
140 140
141all: check 141all: check
142 142
143SELECTOR_DEFAULT = (quote (not (or (tag :expensive-test) (tag :unstable)))) 143SELECTOR_DEFAULT = (not (or (tag :expensive-test) (tag :unstable)))
144SELECTOR_EXPENSIVE = (quote (not (tag :unstable))) 144SELECTOR_EXPENSIVE = (not (tag :unstable))
145SELECTOR_ALL = t 145SELECTOR_ALL = t
146ifdef SELECTOR 146ifdef SELECTOR
147SELECTOR_ACTUAL=$(SELECTOR) 147SELECTOR_ACTUAL=$(SELECTOR)