https://git.ruby-lang.org/ruby.git/commit/?id=071653ecd7

From 071653ecd79287661c795400797a5402c4322129 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 1 Jan 2022 22:17:14 +0900
Subject: Run the prerequisites of test-bundled-gems in order

---
 common.mk     | 6 +++++-
 defs/gmake.mk | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/common.mk b/common.mk
index 664f750a16b..98d3993b232 100644
--- a/common.mk
+++ b/common.mk
@@ -1376,8 +1376,12 @@ test-bundled-gems-precheck: $(TEST_RUNNABLE)-test-bundled-gems-precheck https://github.com/ruby/ruby/blob/trunk/common.mk#L1376
 yes-test-bundled-gems-precheck: main
 no-test-bundled-gems-precheck:
 
-test-bundled-gems-fetch: $(PREP)
+test-bundled-gems-fetch: yes-test-bundled-gems-fetch
+yes-test-bundled-gems-fetch: $(PREP)
+	$(ACTIONS_GROUP)
 	$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems
+	$(ACTIONS_ENDGROUP)
+no-test-bundled-gems-fetch:
 
 test-bundled-gems-prepare: test-bundled-gems-precheck test-bundled-gems-fetch
 test-bundled-gems-prepare: $(TEST_RUNNABLE)-test-bundled-gems-prepare
diff --git a/defs/gmake.mk b/defs/gmake.mk
index dd7da5f7707..da1bdb4b7c2 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -7,7 +7,7 @@ MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j) https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L7
 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)) https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L33
 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), \ https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L82
 	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), \
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/