diff options
author | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:53:27 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:53:27 -0800 |
commit | 5be4e9de1a92d42a99e0368aa05632b209d67bb7 (patch) | |
tree | 7170b3d90d4f8e359e6af120be872a38c9c0c059 | |
parent | c69aef14ddc150da07dcd3527b5a9fb99d6cef34 (diff) | |
parent | f5d14353c22778484df499784e2cffe7655d2880 (diff) | |
download | emacs-5be4e9de1a92d42a99e0368aa05632b209d67bb7.tar.gz |
Merge from origin/emacs-25
f5d1435 Fix targets in test/automated/Makefile.in
-rw-r--r-- | test/Makefile.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index a5755fd2259..26d7e591c7a 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) |