summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2023-03-25 10:12:02 +0900
committernagachika <nagachika@ruby-lang.org>2023-03-25 10:12:02 +0900
commit02bee9d4d404b5134d19b16bc489c20459cce4ac (patch)
tree4d04a2e0f653c9a5a5e19dfc7ddc4254b47b6d36
parent6ee749a52817fc463bbc2e93e5c3874a8c9aacf9 (diff)
merge revision(s) f229b36087f1b387d77af8f3fa50f9bffd2fd44e: [Backport #18989]
Fix test fail with assert_ractor outside of ruby/ruby repo Revert 806583c093ecc2d67830f0a8f0d94decf0ed71e5 --- tool/lib/core_assertions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
-rw-r--r--tool/lib/core_assertions.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb
index 9adc936ad8..5d9af12ca1 100644
--- a/tool/lib/core_assertions.rb
+++ b/tool/lib/core_assertions.rb
@@ -264,7 +264,7 @@ module Test
src = <<eom
# -*- coding: #{line += __LINE__; src.encoding}; -*-
BEGIN {
- require "test/unit";include Test::Unit::Assertions;include Test::Unit::CoreAssertions;require #{__FILE__.dump}
+ require "test/unit";include Test::Unit::Assertions;require #{__FILE__.dump};include Test::Unit::CoreAssertions
separated_runner #{token_dump}, #{res_c&.fileno || 'nil'}
}
#{line -= __LINE__; src}
diff --git a/version.h b/version.h
index 62adbd3275..6aa80e0066 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# 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 209
+#define RUBY_PATCHLEVEL 210
#define RUBY_RELEASE_YEAR 2023
#define RUBY_RELEASE_MONTH 3