summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2024-11-18 16:50:12 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2024-11-18 20:46:07 +0900
commit1a416920f19acccaa7600a6c1e841a198decb50e (patch)
treef2a6e8d9b624681721d05397a63419e3d91c1b38 /common.mk
parentdf077a498ee6c53d74988d80262d9b2dfcbe18d3 (diff)
Load required helpers from bundler examples and invoke bundled_gems_spec.rb at test-bundled-gems
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/12111
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/common.mk b/common.mk
index 07bb8c3f3e..aabae4ddfe 100644
--- a/common.mk
+++ b/common.mk
@@ -1601,7 +1601,7 @@ no-install-for-test-bundled-gems: no-update-default-gemspecs
yes-install-for-test-bundled-gems: yes-update-default-gemspecs
$(XRUBY) -C "$(srcdir)" -r./tool/lib/gem_env.rb bin/gem \
install --no-document --conservative \
- "hoe" "json-schema" "test-unit-rr" "simplecov" "simplecov-html" "simplecov-json"
+ "hoe" "json-schema" "test-unit-rr" "simplecov" "simplecov-html" "simplecov-json" "rspec"
test-bundled-gems-fetch: yes-test-bundled-gems-fetch
yes-test-bundled-gems-fetch:
@@ -1621,9 +1621,10 @@ yes-test-bundled-gems-precheck: Preparing-test-bundled-gems
yes-install-for-test-bundled-gems: Preparing-test-bundled-gems
yes-test-bundled-gems-fetch: Preparing-test-bundled-gems
-
PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
-test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems $(DOT_WAIT) $(TEST_RUNNABLE)-test-bundled-gems-spec
+test-bundled-gems:
+ $(XRUBY) -C $(srcdir) .bundle/bin/rspec $(RSPECOPTS) spec/bundled_gems_spec.rb
+ $(TEST_RUNNABLE)-test-bundled-gems $(DOT_WAIT) $(TEST_RUNNABLE)-test-bundled-gems-spec
yes-test-bundled-gems: test-bundled-gems-run
no-test-bundled-gems: