[Emacs-diffs] master 5be4e9d 19/21: Merge from origin/emacs-25

[John Wiegley]

branch: master
commit 5be4e9de1a92d42a99e0368aa05632b209d67bb7
Merge: c69aef1 f5d1435
Author: John Wiegley <address@hidden>
Commit: John Wiegley <address@hidden>

    Merge from origin/emacs-25
    
    f5d1435 Fix targets in test/automated/Makefile.in
---
 test/Makefile.in |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/test/Makefile.in b/test/Makefile.in
index a5755fd..26d7e59 100644
--- 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)