Merge from origin/emacs-25

f5d1435 Fix targets in test/automated/Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index a5755fd225937e8b3ddd0d371dc9e541b170e236..26d7e591c7a2b23b77fa5064418d3c4512a6d47a 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -94,6 +94,10 @@ SELECTOR_DEFAULT = (quote (not (tag :expensive-test)))
 SELECTOR_EXPENSIVE = nil
 ifdef SELECTOR
 SELECTOR_ACTUAL=$(SELECTOR)
+else ifndef MAKECMDGOALS
+SELECTOR_ACTUAL=$(SELECTOR_DEFAULT)
+else ifeq ($(MAKECMDGOALS),all)
+SELECTOR_ACTUAL=$(SELECTOR_DEFAULT)
 else ifeq ($(MAKECMDGOALS),check)
 SELECTOR_ACTUAL=$(SELECTOR_DEFAULT)
 else ifeq ($(MAKECMDGOALS),check-maybe)