From 130ee27382b4b020e9d0e5bee9ddd2a1640f3887 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@ruby-lang.org>
Date: Fri, 21 Oct 2022 14:17:30 +0900
Subject: merge revision(s) b291c972fa36e05107d13eea25cc445db4b4bec3:

	Use built bundled gems in test-bundled-gems

	---
	 tool/test-bundled-gems.rb | 49 ++++++++++++++++++++++++-----------------------
	 1 file changed, 25 insertions(+), 24 deletions(-)
---
 tool/test-bundled-gems.rb | 49 ++++++++++++++++++++++++-----------------------
 version.h                 |  2 +-
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index e349ce8110..12358b69cc 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -9,9 +9,12 @@ github_actions = ENV["GITHUB_ACTIONS"] == "true"
 allowed_failures = ENV['TEST_BUNDLED_GEMS_ALLOW_FAILURES'] || ''
 allowed_failures = allowed_failures.split(',').reject(&:empty?)
 
+ENV["GEM_PATH"] = [File.realpath('.bundle'), File.realpath('../.bundle', __dir__)].join(File::PATH_SEPARATOR)
+
 rake = File.realpath("../../.bundle/bin/rake", __FILE__)
 gem_dir = File.realpath('../../gems', __FILE__)
 dummy_rake_compiler_dir = File.realpath('../dummy-rake-compiler', __FILE__)
+rubylib = [File.expand_path(dummy_rake_compiler_dir), ENV["RUBYLIB"]].compact.join(File::PATH_SEPARATOR)
 exit_code = 0
 ruby = ENV['RUBY'] || RbConfig.ruby
 failed = []
@@ -24,39 +27,37 @@ File.foreach("#{gem_dir}/bundled_gems") do |line|
   test_command = "#{ruby} -C #{gem_dir}/src/#{gem} #{rake} test"
   first_timeout = 600 # 10min
 
-  if gem == "typeprof"
-    rbs_build_dir = 'ext/-test-/gems/rbs'
-    raise "need to run rbs test suite before typeprof" unless File.readable?("#{rbs_build_dir}/rbs_extension.#{RbConfig::CONFIG['DLEXT']}")
-    ENV["RUBYLIB"] = ["#{gem_dir}/src/rbs/lib", ENV.fetch("RUBYLIB", nil)].compact.join(File::PATH_SEPARATOR)
-  end
+  toplib = gem
+  case gem
+  when "typeprof"
 
-  if gem == "rbs"
+  when "rbs"
     test_command << " stdlib_test validate"
-
     first_timeout *= 3
 
-    # copied from debug gem
-    build_dir = 'ext/-test-/gems/rbs'
-    FileUtils.mkdir_p(build_dir)
-    extconf_path = File.expand_path('../../gems/src/rbs/ext/rbs_extension/extconf.rb', __FILE__)
-    system("#{ruby} -C #{build_dir} #{extconf_path}") or raise
-    system("cd #{build_dir} && make extout=../../../../.ext libdir=../../../..") or raise
-    ENV["RUBYLIB"] = [File.expand_path(dummy_rake_compiler_dir), File.expand_path(build_dir), ENV.fetch("RUBYLIB", nil)].compact.join(File::PATH_SEPARATOR)
-  end
-
-  if gem == "minitest"
+  when "minitest"
     # Tentatively exclude some tests that conflict with error_highlight
     # https://github.com/seattlerb/minitest/pull/880
     test_command << " 'TESTOPTS=-e /test_stub_value_block_args_5__break_if_not_passed|test_no_method_error_on_unexpected_methods/'"
+
+  when "debug"
+    # Since debug gem requires debug.so in child processes without
+    # acitvating the gem, we preset necessary paths in RUBYLIB
+    # environment variable.
+    load_path = true
+
+  when /\Anet-/
+    toplib = gem.tr("-", "/")
+
   end
 
-  if gem == "debug"
-    build_dir = 'ext/-test-/gems/debug'
-    FileUtils.mkdir_p(build_dir)
-    extconf_path = File.expand_path('../../gems/src/debug/ext/debug/extconf.rb', __FILE__)
-    system("#{ruby} -C #{build_dir} #{extconf_path}") or raise
-    system("cd #{build_dir} && make extout=../../../../.ext libdir=../../../..") or raise
-    ENV["RUBYLIB"] = [File.expand_path(build_dir + "/.."), ENV.fetch("RUBYLIB", nil)].compact.join(File::PATH_SEPARATOR)
+  if load_path
+    libs = IO.popen([ruby, "-e", "old = $:.dup; require '#{toplib}'; puts $:-old"], &:read)
+    next unless $?.success?
+    puts libs
+    ENV["RUBYLIB"] = [libs.split("\n"), rubylib].join(File::PATH_SEPARATOR)
+  else
+    ENV["RUBYLIB"] = rubylib
   end
 
   print "[command]" if github_actions
diff --git a/version.h b/version.h
index f70510eca3..841edfa421 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 132
+#define RUBY_PATCHLEVEL 133
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-- 
cgit v1.2.3