diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-06 15:14:19 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-06 15:14:19 +0000 |
| commit | 3757515501347685bfbd9ef11bc03e93c66d1dc9 (patch) | |
| tree | 0e31fa592b796744a6579b84c5fc012ec78740d2 | |
| parent | 3fcecb3cb6150aef27ef2318501b81866bea971a (diff) | |
revert r64925
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | defs/gmake.mk | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index e5409d8702..8af2106d86 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -4,22 +4,25 @@ override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+) override mflags := $(filter-out -j%,$(MFLAGS)) MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j) -ifeq ($(firstword $(filter test-short main check,$(MAKECMDGOALS))),test-short) -ext/configure-ext.mk: | test-short -encdb.h $(ENC_MK): | test-short -else -yes-btest-ruby: | main -endif -yes-test-knownbug: | yes-btest-ruby -yes-test-basic: | yes-test-knownbug -yes-test-testframework: | test-short main -yes-test-almost: | yes-test-testframework -yes-test-spec: | yes-test-almost -install-all install-nodoc: | yes-test-spec -ifneq ($(filter reinstall,$(MAKECMDGOALS)),) -install-all install-nodoc: | uninstall -uninstall: | yes-test-spec -endif +CHECK_TARGETS := great exam love check test check% test% btest% +# expand test targets, and those dependents +TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) +TEST_DEPENDS := $(filter-out commit $(TEST_TARGETS),$(MAKECMDGOALS)) +TEST_TARGETS := $(patsubst great,exam,$(TEST_TARGETS)) +TEST_DEPENDS := $(filter-out great $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_TARGETS := $(patsubst exam,check,$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst check,test-spec test-all,$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst test-rubyspec,test-spec,$(TEST_TARGETS)) +TEST_DEPENDS := $(filter-out exam check test-spec $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS)) +TEST_DEPENDS := $(filter-out love $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_TARGETS := $(patsubst test-all,test test-testframework test-almost,$(patsubst check-%,test test-%,$(TEST_TARGETS))) +TEST_DEPENDS := $(filter-out test-all $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_TARGETS := $(patsubst test,test-short,$(TEST_TARGETS)) +TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST_TARGETS)) +TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS)) +TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts) ifneq ($(filter -O0 -Od,$(optflags)),) override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS)) |