From 907560f5dc7831a30994b64d8207740629133abd Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 11 Aug 2023 15:23:48 +0900 Subject: [PATCH] Fix test-bundler dependencies --- common.mk | 3 ++- defs/gmake.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index b02534c837..e3ab6a1b46 100644 --- a/common.mk +++ b/common.mk @@ -1543,6 +1543,7 @@ test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck no-test-bundler-precheck: yes-test-bundler-precheck: main $(arch)-fake.rb +test-bundler-prepare: $(TEST_RUNNABLE)-test-bundler-prepare no-test-bundler-prepare: no-test-bundler-precheck yes-test-bundler-prepare: yes-test-bundler-precheck $(ACTIONS_GROUP) @@ -1556,7 +1557,7 @@ yes-test-bundler-prepare: yes-test-bundler-precheck RSPECOPTS = BUNDLER_SPECS = -PREPARE_BUNDLER = yes-test-bundler-prepare +PREPARE_BUNDLER = $(TEST_RUNNABLE)-test-bundler-prepare test-bundler: $(TEST_RUNNABLE)-test-bundler yes-test-bundler: $(PREPARE_BUNDLER) $(gnumake_recursive)$(XRUBY) \ diff --git a/defs/gmake.mk b/defs/gmake.mk index 32a298a3af..db622db257 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -27,7 +27,7 @@ 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,test-bundled-gems yes-test-bundler-parallel check,$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst exam,test-bundled-gems test-bundler-parallel check,$(TEST_TARGETS)) TEST_TARGETS := $(patsubst check,test-syntax-suggest test-spec test-all test-tool test-short,$(TEST_TARGETS)) TEST_TARGETS := $(patsubst test-rubyspec,test-spec,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out exam check test-spec $(TEST_TARGETS),$(TEST_DEPENDS))