Align patches

MSP-Greg · Jul 6, 2024 · 6f1a400 · 6f1a400
1 parent b4bcade
commit 6f1a400
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/patches_basic_boot/bootstraptest.patch b/patches_basic_boot/bootstraptest.patch
@@ -1,8 +1,8 @@
 diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
-index 120b78246c..ea3f446ba6 100755
+index 764c4898dd..fdabd2c5c4 100755
 --- a/bootstraptest/runner.rb
 +++ b/bootstraptest/runner.rb
-@@ -706,9 +706,15 @@ def assert_finish(timeout_seconds, testsrc, message = '')
+@@ -710,9 +710,15 @@ def assert_finish(timeout_seconds, testsrc, message = '')
          end
          if io.respond_to?(:read_nonblock)
            if IO.select([io], nil, nil, diff)

diff --git a/patches_install_mswin/win32-setup.mak.patch b/patches_install_mswin/win32-setup.mak.patch
@@ -1,8 +1,8 @@
 diff --git a/win32/setup.mak b/win32/setup.mak
-index 3b822a33c0..3b618826b0 100644
+index 0a1421f0bb..8275d14890 100644
 --- a/win32/setup.mak
 +++ b/win32/setup.mak
-@@ -210,7 +210,10 @@ echo TEENY = RUBY_VERSION_TEENY
+@@ -222,7 +222,10 @@ echo TEENY = RUBY_VERSION_TEENY
  echo ABI_VERSION = RUBY_ABI_VERSION
  #endif
  set /a MSC_VER = _MSC_VER

diff --git a/patches_test/irb-test_command.rb.patch b/patches_test/irb-test_command.rb.patch
@@ -1,8 +1,8 @@
 diff --git a/test/irb/test_command.rb b/test/irb/test_command.rb
-index 8cb8928adb..33698d5b19 100644
+index 30c3f5ca2c..8a18a39591 100644
 --- a/test/irb/test_command.rb
 +++ b/test/irb/test_command.rb
-@@ -793,6 +793,10 @@ def test_show_doc_without_rdoc
+@@ -783,6 +783,10 @@ def test_show_doc_without_rdoc
    end
 
    class EditTest < CommandTestCase
@@ -13,7 +13,7 @@ index 8cb8928adb..33698d5b19 100644
      def setup
        @original_visual = ENV["VISUAL"]
        @original_editor = ENV["EDITOR"]
-@@ -852,7 +856,7 @@ def test_edit_with_constant
+@@ -842,7 +846,7 @@ def test_edit_with_constant
        )
 
        assert_empty err
@@ -22,7 +22,7 @@ index 8cb8928adb..33698d5b19 100644
        assert_match("command: ': code'", out)
      end
 
-@@ -862,7 +866,7 @@ def test_edit_with_class_method
+@@ -852,7 +856,7 @@ def test_edit_with_class_method
        )
 
        assert_empty err
@@ -31,7 +31,7 @@ index 8cb8928adb..33698d5b19 100644
        assert_match("command: ': code'", out)
      end
 
-@@ -872,7 +876,7 @@ def test_edit_with_instance_method
+@@ -862,7 +866,7 @@ def test_edit_with_instance_method
        )
 
        assert_empty err