diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-20 21:16:32 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-20 21:16:32 +0900 |
| commit | 5932b426bc2edc27195d936152ec5a726405ec9e (patch) | |
| tree | aeafaadd73f8974bc3d7d13ad9b2da6a7a87be84 /defs | |
| parent | 72e9097d37f6bab42eeeb6c14b5c0b1f564254cf (diff) | |
merge revision(s) 071653ecd79287661c795400797a5402c4322129:
Run the prerequisites of test-bundled-gems in order
---
common.mk | 6 +++++-
defs/gmake.mk | 7 ++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 7243a304dc..bf3c383c4e 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -7,7 +7,7 @@ MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j) nproc = $(subst -j,,$(filter -j%,$(MFLAGS))) ifeq ($(GITHUB_ACTIONS),true) -override ACTIONS_GROUP = @echo "\#\#[group]$(@:yes-=)" +override ACTIONS_GROUP = @echo "\#\#[group]$(patsubst yes-%,%,$@)" override ACTIONS_ENDGROUP = @echo "\#\#[endgroup]" endif @@ -33,6 +33,9 @@ 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_TARGETS := $(patsubst test-bundled-gems,test-bundled-gems-run,$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst test-bundled-gems-run,test-bundled-gems-run $(PREPARE_BUNDLED_GEMS),$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst test-bundled-gems-prepare,test-bundled-gems-prepare test-bundled-gems-precheck test-bundled-gems-fetch,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts) @@ -79,6 +82,8 @@ ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \ btest-ruby test-knownbug test-basic \ test-testframework test-tool test-ruby test-all \ test-spec test-bundler-prepare test-bundler test-bundler-parallel \ + test-bundled-gems-precheck test-bundled-gems-fetch \ + test-bundled-gems-prepare test-bundled-gems-run \ ) prev_test := $(if $(filter test-spec,$(ORDERED_TEST_TARGETS)),test-spec-precheck) $(foreach test,$(ORDERED_TEST_TARGETS), \ |