Backport to 3.9

.github/workflows/ruby.yml

@@ -44,8 +44,6 @@ jobs:
           bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
-      - name: Set up permission
-        run: chmod -R o-w /opt/hostedtoolcache/Ruby
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -90,8 +88,6 @@ jobs:
           bundler-cache: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
-      - name: Set up permission
-        run: chmod -R o-w /opt/hostedtoolcache/Ruby
       - name: Install dependencies
         run: |
           sudo apt-get update

.github/workflows/typecheck.yml

@@ -20,8 +20,6 @@ jobs:
           bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
-      - name: Set up permission
-        run: chmod -R o-w /opt/hostedtoolcache/Ruby
       - name: Install dependencies
         run: |
           sudo apt-get update

test/stdlib/CGI_test.rb

@@ -11,7 +11,7 @@
     ARGV.replace(%w(abc=001 def=002))
     assert_send_type  "() -> void",
                       CGI, :new
     assert_send_type  "(?::String options) -> void",
                       CGI, :new, 'html3'
     assert_send_type  "(?::String options) ?{ (::String name, ::String value) -> void } -> void",
                       CGI, :new, 'html3' do |name, value| name + value end
@@ -22,19 +22,19 @@
   end
 
   def test_accept_charset
     assert_send_type  "() -> ::encoding",
                       CGI, :accept_charset
   end
 
   def test_accept_charset=
     assert_send_type  "(::String accept_charset) -> ::String",
                       CGI, :accept_charset=, 'utf-8'
     assert_send_type  "(::Encoding accept_charset) -> ::Encoding",
                       CGI, :accept_charset=, Encoding::UTF_8
   end
 
   def test_parse
     assert_send_type  "(::String query) -> ::Hash[::String, String | Array[String]]",
                       CGI, :parse, 'a=hoge&b=1&c[]=test1&c[]=test2'
   end
 
@@ -68,6 +68,7 @@
   testing "::CGI"
 
   def setup
+    super
     ARGV.replace(%w(abc=001 def=002))
   end
 
@@ -77,7 +78,7 @@
   end
 
   def test_http_header
     assert_send_type  "() -> ::String",
                       CGI.new, :http_header
     assert_send_type  "(::String options) -> ::String",
                       CGI.new, :http_header, 'text/csv'
@@ -88,7 +89,7 @@
   end
 
   def test_header
     assert_send_type  "() -> ::String",
                       CGI.new, :header
     assert_send_type  "(::String options) -> ::String",
                       CGI.new, :header, 'text/csv'
@@ -99,12 +100,12 @@
   end
 
   def test_nph?
     assert_send_type  "() -> ::boolish",
                       CGI.new, :nph?
   end
 
   def test_out
     assert_send_type  "() { () -> void } -> void",
                       CGI.new, :out do '' end
     assert_send_type  "(::String content_type_string) { () -> String } -> void",
                       CGI.new, :out, 'text/csv' do '' end
@@ -115,12 +116,12 @@
   end
 
   def test_stdinput
     assert_send_type  "() -> ::IO",
                       CGI.new, :stdinput
   end
 
   def test_stdoutput
     assert_send_type  "() -> ::IO",
                       CGI.new, :stdoutput
   end
 end

test/stdlib/Forwardable_test.rb

@@ -71,6 +71,7 @@ class SingleForwardableTest < Test::Unit::TestCase
   testing "::SingleForwardable"
 
   def setup
+    super
     @tested = Object.new
     @tested.extend SingleForwardable
   end

test/stdlib/Minitest_test.rb

@@ -51,9 +51,10 @@ class MinitestTestLifecycleHooksTest < Test::Unit::TestCase
 
   class LifecycleSetup < Minitest::Test
     def setup
+      super
       @foo = 123
     end
-  end  
+  end
 
   def test_setup_return_type_void
     test = LifecycleSetup.new("setup")

test/stdlib/Ractor_test.rb

@@ -132,6 +132,8 @@ class RactorInstanceTest < Test::Unit::TestCase
   testing "::Ractor"
 
   def test_aref
+    omit "Accessing ractor local storage" if RUBY_VERSION >= "3.5"
+
     r = Ractor.new {}
     r['foo'] = 'bar'
     assert_send_type "(String) -> untyped",
@@ -141,6 +143,8 @@ def test_aref
   end
 
   def test_aset
+    omit "Accessing ractor local storage" if RUBY_VERSION >= "3.5"
+
     r = Ractor.new {}
     assert_send_type "(String, String) -> String",
                      r, :[]=, 'foo', 'bar'

test/stdlib/uri/rfc2396_parser_test.rb

@@ -20,6 +20,7 @@ class URIRFC2396_ParserInstanceTest < Test::Unit::TestCase
   testing "::URI::RFC2396_Parser"
 
   def setup
+    super
     @instance = URI::RFC2396_Parser.new
   end