https://git.ruby-lang.org/ruby.git/commit/?id=5f2987d6c2

From 5f2987d6c2ae9ace3178ac3e1bbb4ac7079101eb Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Wed, 4 Aug 2021 17:38:46 +0900
Subject: Fix relative paths from core_assertions.rb

---
 tool/lib/core_assertions.rb         | 6 +++---
 tool/test/testunit/test_parallel.rb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb
index eb06412..43ced2f 100644
--- a/tool/lib/core_assertions.rb
+++ b/tool/lib/core_assertions.rb
@@ -117,7 +117,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/tool/lib/core_assertions.rb#L117
         # TODO: consider choosing some appropriate limit for MJIT and stop skipping this once it does not randomly fail
         pend 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::JIT) && RubyVM::JIT.enabled?
 
-        require_relative '../../memory_status'
+        require_relative 'memory_status'
         raise MiniTest::Skip, "unsupported platform" unless defined?(Memory::Status)
 
         token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m"
@@ -126,7 +126,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/tool/lib/core_assertions.rb#L126
         envs = args.shift if Array === args and Hash === args.first
         args = [
           "--disable=gems",
-          "-r", File.expand_path("../../../memory_status", __FILE__),
+          "-r", File.expand_path("../memory_status", __FILE__),
           *args,
           "-v", "-",
         ]
@@ -478,7 +478,7 @@ eom https://github.com/ruby/ruby/blob/trunk/tool/lib/core_assertions.rb#L478
         ex
       end
 
-      MINI_DIR = File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), "minitest") #:nodoc:
+      MINI_DIR = File.join(File.dirname(File.expand_path(__FILE__)), "minitest") #:nodoc:
 
       # :call-seq:
       #   assert(test, [failure_message])
diff --git a/tool/test/testunit/test_parallel.rb b/tool/test/testunit/test_parallel.rb
index fa87ca5..c3c643f 100644
--- a/tool/test/testunit/test_parallel.rb
+++ b/tool/test/testunit/test_parallel.rb
@@ -113,7 +113,7 @@ module TestParallel https://github.com/ruby/ruby/blob/trunk/tool/test/testunit/test_parallel.rb#L113
 
         result = Marshal.load($1.chomp.unpack("m")[0])
         assert_equal(5, result[0])
-        assert_equal(17, result[1])
+        assert_equal(12, result[1])
         assert_kind_of(Array,result[2])
         assert_kind_of(Array,result[3])
         assert_kind_of(Array,result[4])
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/