1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix make test-bundler

Browse Source
This commit is contained in:
David Rodríguez 2025-06-05 09:58:28 +02:00 committed by Hiroshi SHIBATA
parent dba72134de
commit ec897fd204
Notes: git 2025-06-11 00:39:10 +00:00 
Merged: https://github.com/ruby/ruby/pull/13520
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@ -1686,7 +1686,7 @@ yes-test-bundler: $(PREPARE_BUNDLER)
$(gnumake_recursive)$(XRUBY) \ $(gnumake_recursive)$(XRUBY) \
-r./$(arch)-fake \ -r./$(arch)-fake \
-e "exec(*ARGV)" -- \ -e "exec(*ARGV)" -- \
$(XRUBY) -C $(srcdir) -Ispec/bundler -Ispec/lib .bundle/bin/rspec \ $(XRUBY) -C $(srcdir) -Ispec/bundler -Ispec/lib spec/bin/rspec \
-r spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS) -r spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
no-test-bundler: no-test-bundler:

6
spec/bin/rspec Executable file
View File

@ -0,0 +1,6 @@
#!/usr/bin/env ruby
# frozen_string_literal: true
require_relative "../bundler/support/setup"
Spec::Rubygems.gem_load("rspec-core", "rspec")

8
tool/sync_default_gems.rb
View File

@ -136,9 +136,11 @@ module SyncDefaultGems
cp_r("#{upstream}/bundler/spec", "spec/bundler") cp_r("#{upstream}/bundler/spec", "spec/bundler")
rm_rf("spec/bundler/bin") rm_rf("spec/bundler/bin")
parallel_tests_content = File.read("#{upstream}/bundler/bin/parallel_rspec").gsub("../spec", "../bundler") ["parallel_rspec", "rspec"].each do |binstub|
File.write("spec/bin/parallel_rspec", parallel_tests_content) content = File.read("#{upstream}/bundler/bin/#{binstub}").gsub("../spec", "../bundler")
chmod("+x", "spec/bin/parallel_rspec") File.write("spec/bin/#{binstub}", content)
chmod("+x", "spec/bin/#{binstub}")
end
%w[dev_gems test_gems rubocop_gems standard_gems].each do |gemfile| %w[dev_gems test_gems rubocop_gems standard_gems].each do |gemfile|
["rb.lock", "rb"].each do |ext| ["rb.lock", "rb"].each do |ext|