summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2022-12-23 11:46:21 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2022-12-28 09:15:31 +0900
commit84a4f1b3b27864ea334ead4ea82a18e6d26c06dc (patch)
treec0d883c0d07a9613093d25dc004dad56859872d2
parentec7e082906d5c32c5e895137fd0d562fa237ca12 (diff)
downloadruby-84a4f1b3b27864ea334ead4ea82a18e6d26c06dc.tar.gz
Order test-bundler-parallel dependency
-rw-r--r--common.mk5
-rw-r--r--defs/gmake.mk1
2 files changed, 4 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index e89d12757d..5c15c2dfdc 100644
--- a/common.mk
+++ b/common.mk
@@ -1492,8 +1492,9 @@ yes-test-bundler-prepare: yes-test-bundler-precheck
RSPECOPTS =
BUNDLER_SPECS =
+PREPARE_BUNDLER = yes-test-bundler-prepare
test-bundler: $(TEST_RUNNABLE)-test-bundler
-yes-test-bundler: yes-test-bundler-prepare
+yes-test-bundler: $(PREPARE_BUNDLER)
$(gnumake_recursive)$(XRUBY) \
-r./$(arch)-fake \
-e "exec(*ARGV)" -- \
@@ -1503,7 +1504,7 @@ no-test-bundler:
PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log
test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel
-yes-test-bundler-parallel: yes-test-bundler-prepare
+yes-test-bundler-parallel: $(PREPARE_BUNDLER)
$(gnumake_recursive)$(XRUBY) \
-r./$(arch)-fake \
-e "ARGV[-1] = File.expand_path(ARGV[-1])" \
diff --git a/defs/gmake.mk b/defs/gmake.mk
index e0ca80b853..0c58328fb9 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -40,6 +40,7 @@ TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST
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 $(PRECHECK_BUNDLED_GEMS) test-bundled-gems-fetch,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst test-bundler-parallel,test-bundler-parallel $(PREPARE_BUNDLER),$(TEST_TARGETS))
TEST_TARGETS := $(patsubst test-syntax-suggest,test-syntax-suggest $(PREPARE_SYNTAX_SUGGEST),$(TEST_TARGETS))
TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS))
TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts)