From 196155812be09fdc4c36f8d7d6d1fbc69948765c Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 4 Aug 2025 17:49:13 -0700 Subject: [PATCH 1/5] Resurrect another ZJIT skip on test_handle_interrupted? Failed at: https://github.com/ruby/ruby/actions/runs/16737407508/job/47378992863 Partially reverting https://github.com/ruby/ruby/pull/14097 --- test/.excludes-zjit/TestThread.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/.excludes-zjit/TestThread.rb b/test/.excludes-zjit/TestThread.rb index f6a4b7009b4704..121ddd9542d5dd 100644 --- a/test/.excludes-zjit/TestThread.rb +++ b/test/.excludes-zjit/TestThread.rb @@ -1 +1,2 @@ exclude(:test_switch_while_busy_loop, 'Test sometimes hangs with ZJIT') +exclude(:test_handle_interrupted?, 'Test sometimes fails with ZJIT') From 3c6bd9c9c7cf6483c34fb0d2c278dce4749a6ae1 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 5 Aug 2025 10:33:53 +0900 Subject: [PATCH 2/5] Pathname is now core class. We will restore this sync target when `lib/pathname.rb` is migrated to `pathname_builtin.rb` and backport that file to `ruby/pathname` repo. --- tool/sync_default_gems.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 7a231772b5cbb4..5794edaa83145a 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -38,7 +38,6 @@ module SyncDefaultGems open3: "ruby/open3", openssl: "ruby/openssl", optparse: "ruby/optparse", - pathname: "ruby/pathname", pp: "ruby/pp", prettyprint: "ruby/prettyprint", prism: ["ruby/prism", "main"], @@ -278,13 +277,6 @@ def sync_default_gems(gem) cp_r("#{upstream}/test/erb", "test") cp_r("#{upstream}/erb.gemspec", "lib/erb") cp_r("#{upstream}/libexec/erb", "libexec") - when "pathname" - rm_rf(%w[ext/pathname test/pathname]) - cp_r("#{upstream}/ext/pathname", "ext") - cp_r("#{upstream}/test/pathname", "test") - cp_r("#{upstream}/lib", "ext/pathname") - cp_r("#{upstream}/pathname.gemspec", "ext/pathname") - `git checkout ext/pathname/depend` when "digest" rm_rf(%w[ext/digest test/digest]) cp_r("#{upstream}/ext/digest", "ext") From 946165bd48b7f47dbe38f7a130983e429e1dd25d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 5 Aug 2025 10:57:19 +0900 Subject: [PATCH 3/5] Added clang-22 build --- .github/workflows/compilers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml index d0be762ceeb7c2..f52cab97081d30 100644 --- a/.github/workflows/compilers.yml +++ b/.github/workflows/compilers.yml @@ -107,6 +107,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github } - { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } } + - { uses: './.github/actions/compilers', name: 'clang 22', with: { tag: 'clang-22' } } - { uses: './.github/actions/compilers', name: 'clang 21', with: { tag: 'clang-21' } } - { uses: './.github/actions/compilers', name: 'clang 20', with: { tag: 'clang-20' } } - { uses: './.github/actions/compilers', name: 'clang 19', with: { tag: 'clang-19' } } From 015d8741339a8f134e00638dad388549be58c988 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 5 Aug 2025 11:38:32 +0900 Subject: [PATCH 4/5] Sync https://github.com/ruby/test-unit-ruby-core/pull/8 --- tool/lib/core_assertions.rb | 8 +++----- tool/lib/envutil.rb | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb index ece6ca1dc8c373..958306c0c5c263 100644 --- a/tool/lib/core_assertions.rb +++ b/tool/lib/core_assertions.rb @@ -690,17 +690,15 @@ def assert_warn(*args) assert_warning(*args) {$VERBOSE = false; yield} end - def assert_deprecated_warning(mesg = /deprecated/) + def assert_deprecated_warning(mesg = /deprecated/, &block) assert_warning(mesg) do - Warning[:deprecated] = true if Warning.respond_to?(:[]=) - yield + EnvUtil.deprecation_warning(&block) end end def assert_deprecated_warn(mesg = /deprecated/) assert_warn(mesg) do - Warning[:deprecated] = true if Warning.respond_to?(:[]=) - yield + EnvUtil.deprecation_warning(&block) end end diff --git a/tool/lib/envutil.rb b/tool/lib/envutil.rb index fe166d85145ea7..ab5e8d84e9c371 100644 --- a/tool/lib/envutil.rb +++ b/tool/lib/envutil.rb @@ -297,6 +297,21 @@ def flush; end end module_function :verbose_warning + if defined?(Warning.[]=) + def deprecation_warning + previous_deprecated = Warning[:deprecated] + Warning[:deprecated] = true + yield + ensure + Warning[:deprecated] = previous_deprecated + end + else + def deprecation_warning + yield + end + end + module_function :deprecation_warning + def default_warning $VERBOSE = false yield From 06b14f29a34fe621696d6beae0c00486a6879539 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 5 Aug 2025 12:13:27 +0900 Subject: [PATCH 5/5] Added missing block argument --- tool/lib/core_assertions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb index 958306c0c5c263..00d180fa8ce088 100644 --- a/tool/lib/core_assertions.rb +++ b/tool/lib/core_assertions.rb @@ -696,7 +696,7 @@ def assert_deprecated_warning(mesg = /deprecated/, &block) end end - def assert_deprecated_warn(mesg = /deprecated/) + def assert_deprecated_warn(mesg = /deprecated/, &block) assert_warn(mesg) do EnvUtil.deprecation_warning(&block) end