Fix test-bundled-gems for Ruby 3.1 (#7935)

* pry is not needed for test-bundled-gems

* Run test-unit test without rake task to avoid yard dependency

* Try to skip Prime_test.rb

2 files changed, 14 insertions, 1 deletions

diff --git a/common.mk b/common.mk
index a3990a5a2f..58ecf1f54f 100644
--- a/common.mk
+++ b/common.mk
@@ -1408,7 +1408,7 @@ no-test-bundled-gems-prepare: no-test-bundled-gems-precheck
 yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck
 	$(ACTIONS_GROUP)
 	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
-		--install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe:~> 3.26" "yard" "pry" "packnga" "rexml" "json-schema" "test-unit-rr"
+		--install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe:~> 3.26" "rexml" "json-schema" "test-unit-rr"
 	$(ACTIONS_ENDGROUP)
 
 PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index ccf9d452ce..6f9a5e8738 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -33,6 +33,16 @@ File.foreach("#{gem_dir}/bundled_gems") do |line|
   when "typeprof"
 
   when "rbs"
+    # TODO: We should skip test file instead of test class/methods
+    skip_test_files = %w[
+      test/stdlib/Prime_test.rb
+    ]
+
+    skip_test_files.each do |file|
+      path = "#{gem_dir}/src/#{gem}/#{file}"
+      File.unlink(path) if File.exist?(path)
+    end
+
     test_command << " stdlib_test validate"
     first_timeout *= 3
 
@@ -52,6 +62,9 @@ File.foreach("#{gem_dir}/bundled_gems") do |line|
       envs["RUBY_DEBUG_TEST_NO_REMOTE"] = "1"
     end
 
+  when "test-unit"
+    test_command = "#{ruby} -C #{gem_dir}/src/#{gem} test/run-test.rb"
+
   when /\Anet-/
     toplib = gem.tr("-", "/")