1 files changed, 29 insertions, 15 deletions

diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index 12358b69cc..eeec1d7aed 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -1,6 +1,7 @@
 require 'rbconfig'
 require 'timeout'
 require 'fileutils'
+require_relative 'lib/colorize'
 
 ENV.delete("GNUMAKEFLAGS")
 
@@ -11,10 +12,10 @@ allowed_failures = allowed_failures.split(',').reject(&:empty?)
 
 ENV["GEM_PATH"] = [File.realpath('.bundle'), File.realpath('../.bundle', __dir__)].join(File::PATH_SEPARATOR)
 
+colorize = Colorize.new
 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)
+rubylib = [gem_dir+'/lib', ENV["RUBYLIB"]].compact.join(File::PATH_SEPARATOR)
 exit_code = 0
 ruby = ENV['RUBY'] || RbConfig.ruby
 failed = []
@@ -22,30 +23,41 @@ File.foreach("#{gem_dir}/bundled_gems") do |line|
   next if /^\s*(?:#|$)/ =~ line
   gem = line.split.first
   next if ARGV.any? {|pat| !File.fnmatch?(pat, gem)}
-  puts "#{github_actions ? "##[group]" : "\n"}Testing the #{gem} gem"
+  # 93(bright yellow) is copied from .github/workflows/mingw.yml
+  puts "#{github_actions ? "::group::\e\[93m" : "\n"}Testing the #{gem} gem#{github_actions ? "\e\[m" : ""}"
 
   test_command = "#{ruby} -C #{gem_dir}/src/#{gem} #{rake} test"
   first_timeout = 600 # 10min
 
   toplib = gem
   case gem
+  when "resolv-replace"
+    # Skip test suite
+    next
   when "typeprof"
 
   when "rbs"
-    test_command << " stdlib_test validate"
-    first_timeout *= 3
+    # TODO: We should skip test file instead of test class/methods
+    skip_test_files = %w[
+    ]
 
-  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/'"
+    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 RBS_SKIP_TESTS=#{__dir__}/rbs_skip_tests SKIP_RBS_VALIDATION=true"
+    first_timeout *= 3
 
   when "debug"
     # Since debug gem requires debug.so in child processes without
-    # acitvating the gem, we preset necessary paths in RUBYLIB
+    # activating the gem, we preset necessary paths in RUBYLIB
     # environment variable.
     load_path = true
 
+  when "test-unit"
+    test_command = "#{ruby} -C #{gem_dir}/src/#{gem} test/run-test.rb"
+
   when /\Anet-/
     toplib = gem.tr("-", "/")
 
@@ -79,19 +91,21 @@ File.foreach("#{gem_dir}/bundled_gems") do |line|
     break
   end
 
+  print "::endgroup::\n" if github_actions
   unless $?.success?
 
-    puts "Tests failed " +
-         ($?.signaled? ? "by SIG#{Signal.signame($?.termsig)}" :
-            "with exit code #{$?.exitstatus}")
+    mesg = "Tests failed " +
+           ($?.signaled? ? "by SIG#{Signal.signame($?.termsig)}" :
+              "with exit code #{$?.exitstatus}")
+    puts colorize.decorate(mesg, "fail")
     if allowed_failures.include?(gem)
-      puts "Ignoring test failures for #{gem} due to \$TEST_BUNDLED_GEMS_ALLOW_FAILURES"
+      mesg = "Ignoring test failures for #{gem} due to \$TEST_BUNDLED_GEMS_ALLOW_FAILURES"
+      puts colorize.decorate(mesg, "skip")
     else
       failed << gem
       exit_code = $?.exitstatus if $?.exitstatus
     end
   end
-  print "##[endgroup]\n" if github_actions
 end
 
 puts "Failed gems: #{failed.join(', ')}" unless failed.empty?