merge revision(s) f229b36087: [Backport #18989]

Fix test fail with assert_ractor outside of ruby/ruby repo

	  Revert 806583c093
	---
	 tool/lib/core_assertions.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
This commit is contained in:
nagachika 2023-03-25 10:12:02 +09:00
parent 6ee749a528
commit 02bee9d4d4
2 changed files with 2 additions and 2 deletions

View file

@ -264,7 +264,7 @@ module Test
src = <<eom src = <<eom
# -*- coding: #{line += __LINE__; src.encoding}; -*- # -*- coding: #{line += __LINE__; src.encoding}; -*-
BEGIN { 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'} separated_runner #{token_dump}, #{res_c&.fileno || 'nil'}
} }
#{line -= __LINE__; src} #{line -= __LINE__; src}

View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4 #define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #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_YEAR 2023
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3