5 files changed, 43 insertions, 28 deletions
diff --git a/tool/auto-style.rb b/tool/auto-style.rb
index d2b007bd51..0c6ce6848a 100644..100755
--- a/tool/auto-style.rb
+++ b/tool/auto-style.rb
@@ -69,7 +69,7 @@ class Git
   def git(*args)
     cmd = ['git', *args].shelljoin
     puts "+ #{cmd}"
-    unless with_clean_env { system(cmd) }
+    unless with_clean_env { system('git', *args) }
       abort "Failed to run: #{cmd}"
     end
   end
@@ -173,6 +173,10 @@ IGNORED_FILES = [
   %r{\Asample/trick[^/]*/},
 ]
 
+DIFFERENT_STYLE_FILES = %w[
+  addr2line.c io_buffer.c prism*.c scheduler.c
+]
+
 oldrev, newrev, pushref = ARGV
 unless dry_run = pushref.empty?
   branch = IO.popen(['git', 'rev-parse', '--symbolic', '--abbrev-ref', pushref], &:read).strip
@@ -194,7 +198,7 @@ if files.empty?
   exit
 end
 
-trailing = eofnewline = expandtab = false
+trailing = eofnewline = expandtab = indent = false
 
 edited_files = files.select do |f|
   src = File.binread(f) rescue next
@@ -202,6 +206,8 @@ edited_files = files.select do |f|
 
   trailing0 = false
   expandtab0 = false
+  indent0 = false
+
   src.gsub!(/^.*$/).with_index do |line, lineno|
     trailing = trailing0 = true if line.sub!(/[ \t]+$/, '')
     line
@@ -225,7 +231,15 @@ edited_files = files.select do |f|
     end
   end
 
-  if trailing0 or eofnewline0 or expandtab0
+  if File.fnmatch?("*.[ch]", f, File::FNM_PATHNAME) &&
+     !DIFFERENT_STYLE_FILES.any? {|pat| File.fnmatch?(pat, f, File::FNM_PATHNAME)}
+    indent0 = true if src.gsub!(/^\w+\([^(\n)]*?\)\K[ \t]*(?=\{$)/, "\n")
+    indent0 = true if src.gsub!(/^([ \t]*)\}\K[ \t]*(?=else\b)/, "\n" '\1')
+    indent0 = true if src.gsub!(/^[ \t]*\}\n\K\n+(?=[ \t]*else\b)/, '')
+    indent ||= indent0
+  end
+
+  if trailing0 or eofnewline0 or expandtab0 or indent0
     File.binwrite(f, src)
     true
   end
@@ -236,6 +250,7 @@ else
   msg = [('remove trailing spaces' if trailing),
          ('append newline at EOF' if eofnewline),
          ('expand tabs' if expandtab),
+         ('adjust indents' if indent),
         ].compact
   message = "* #{msg.join(', ')}. [ci skip]"
   if expandtab
diff --git a/tool/lib/_tmpdir.rb b/tool/lib/_tmpdir.rb
index fd429dab37..daa1a1f235 100644
--- a/tool/lib/_tmpdir.rb
+++ b/tool/lib/_tmpdir.rb
@@ -4,11 +4,11 @@ template = "rubytest."
 # Assume the directory by these environment variables are safe.
 base = [ENV["TMPDIR"], ENV["TMP"], "/tmp"].find do |tmp|
   next unless tmp and tmp.size <= 50 and File.directory?(tmp)
-  # On macOS, the default TMPDIR is very long, inspite of UNIX socket
-  # path length is limited.
+  # On macOS, the default TMPDIR is very long, in spite of UNIX socket
+  # path length being limited.
   #
   # Also Rubygems creates its own temporary directory per tests, and
-  # some tests copy the full path of gemhome there.  In that caes, the
+  # some tests copy the full path of gemhome there.  In that case, the
   # path contains both temporary names twice, and can exceed path name
   # limit very easily.
   tmp
diff --git a/tool/lib/envutil.rb b/tool/lib/envutil.rb
index 573fd5122c..101ea350c6 100644
--- a/tool/lib/envutil.rb
+++ b/tool/lib/envutil.rb
@@ -98,7 +98,7 @@ module EnvUtil
     def start(pid, *args) end
 
     def dump(pid, timeout: 60, reprieve: timeout&.div(4))
-      dpid = start(pid, *command_file(File.join(__dir__, "dump.#{name}")))
+      dpid = start(pid, *command_file(File.join(__dir__, "dump.#{name}")), out: :err)
     rescue Errno::ENOENT
       return
     else
@@ -121,8 +121,8 @@ module EnvUtil
     register("gdb") do
       class << self
         def usable?; system(*%w[gdb --batch --quiet --nx -ex exit]); end
-        def start(pid, *args)
-          spawn(*%w[gdb --batch --quiet --pid #{pid}], *args)
+        def start(pid, *args, **opts)
+          spawn(*%W[gdb --batch --quiet --pid #{pid}], *args, **opts)
         end
         def command_file(file) "--command=#{file}"; end
       end
@@ -131,8 +131,8 @@ module EnvUtil
     register("lldb") do
       class << self
         def usable?; system(*%w[lldb -Q --no-lldbinit -o exit]); end
-        def start(pid, *args)
-          spawn(*%w[lldb --batch -Q --attach-pid #{pid}])
+        def start(pid, *args, **opts)
+          spawn(*%W[lldb --batch -Q --attach-pid #{pid}], *args, **opts)
         end
         def command_file(file) ["--source", file]; end
       end
diff --git a/tool/test/testunit/test_parallel.rb b/tool/test/testunit/test_parallel.rb
index a0cbca69eb..d87e0ed327 100644
--- a/tool/test/testunit/test_parallel.rb
+++ b/tool/test/testunit/test_parallel.rb
@@ -126,19 +126,19 @@ module TestParallel
         assert_not_nil($1, "'done' was not found")
 
         result = Marshal.load($1.chomp.unpack1("m"))
-        assert_equal(5, result[0])
-        pend "TODO: result[1] returns 17. We should investigate it" do # TODO: misusage of pend (pend doens't use given block)
-          assert_equal(12, result[1])
-        end
-        assert_kind_of(Array,result[2])
-        assert_kind_of(Array,result[3])
-        assert_kind_of(Array,result[4])
-        assert_kind_of(Array,result[2][1])
-        assert_kind_of(Test::Unit::AssertionFailedError,result[2][0][2])
-        assert_kind_of(Test::Unit::PendedError,result[2][1][2])
-        assert_kind_of(Test::Unit::PendedError,result[2][2][2])
-        assert_kind_of(Exception, result[2][3][2])
-        assert_equal(result[5], "TestE")
+        tests, asserts, reports, failures, loadpaths, suite = result
+        assert_equal(5, tests)
+        assert_equal(12, asserts)
+        assert_kind_of(Array, reports)
+        assert_kind_of(Array, failures)
+        assert_kind_of(Array, loadpaths)
+        reports.sort_by! {|_, t| t}
+        assert_kind_of(Array, reports[1])
+        assert_kind_of(Test::Unit::AssertionFailedError, reports[0][2])
+        assert_kind_of(Test::Unit::PendedError, reports[1][2])
+        assert_kind_of(Test::Unit::PendedError, reports[2][2])
+        assert_kind_of(Exception, reports[3][2])
+        assert_equal("TestE", suite)
       end
     end
 
diff --git a/tool/test/testunit/tests_for_parallel/ptest_forth.rb b/tool/test/testunit/tests_for_parallel/ptest_forth.rb
index 8831676e19..54474c828d 100644
--- a/tool/test/testunit/tests_for_parallel/ptest_forth.rb
+++ b/tool/test/testunit/tests_for_parallel/ptest_forth.rb
@@ -8,19 +8,19 @@ class TestE < Test::Unit::TestCase
     assert_equal(1,1)
   end
 
-  def test_always_skip
-    skip "always"
+  def test_always_omit
+    omit "always"
   end
 
   def test_always_fail
     assert_equal(0,1)
   end
 
-  def test_skip_after_unknown_error
+  def test_pend_after_unknown_error
     begin
       raise UnknownError, "unknown error"
     rescue
-      skip "after raise"
+      pend "after raise"
     end
   end