From 42325aa826dada78d95b559fc50aaf4444edfbb0 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 30 Jul 2023 15:13:58 +0900 Subject: Ease the `Encoding::CompatibilityError` test failure At the time this test first started using `assert_raise_with_message`, it did not touch `Encoding.default_internal`. --- test/ruby/test_require.rb | 3 ++- version.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 54165bc31c..a71fe0932e 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -68,7 +68,8 @@ class TestRequire < Test::Unit::TestCase def test_require_nonascii bug3758 = '[ruby-core:31915]' ["\u{221e}", "\x82\xa0".force_encoding("cp932")].each do |path| - assert_raise_with_message(LoadError, /#{path}\z/, bug3758) {require path} + e = assert_raise(LoadError, bug3758) {require path} + assert_operator(e.message, :end_with?, path, bug3758) end end diff --git a/version.h b/version.h index 4bf9c0fd17..1547c964d1 100644 --- a/version.h +++ b/version.h @@ -11,11 +11,11 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 4 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 247 +#define RUBY_PATCHLEVEL 248 #define RUBY_RELEASE_YEAR 2023 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #include "ruby/version.h" -- cgit v1.2.3