ruby-changes:73080
From: Takashi <ko1@a...>
Date: Sun, 28 Aug 2022 04:07:06 +0900 (JST)
Subject: [ruby-changes:73080] 95d2d7920c (master): Try to prevent the failure of FileUtils.rm_rf
https://git.ruby-lang.org/ruby.git/commit/?id=95d2d7920c From 95d2d7920c97d0502ebed4ba439177325ad05e57 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun <takashikkbn@g...> Date: Sat, 27 Aug 2022 12:05:41 -0700 Subject: Try to prevent the failure of FileUtils.rm_rf --- test/rubygems/helper.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb index 23ea69ae0b..4e92ae827e 100644 --- a/test/rubygems/helper.rb +++ b/test/rubygems/helper.rb @@ -465,11 +465,13 @@ class Gem::TestCase < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/helper.rb#L465 Dir.chdir @current_dir - # FileUtils.rm_rf randomly fails on ci.rvm.jp trunk-mjit - if ENV['RUBY_DEBUG']&.include?('ci') - system('rm', '-rf', @tempdir) - else - FileUtils.rm_rf @tempdir + # Prevent a race condition on removing TMPDIR being written by MJIT + if defined?(RubyVM::MJIT.enabled?) && RubyVM::MJIT.enabled? + RubyVM::MJIT.pause + end + FileUtils.rm_rf @tempdir + if defined?(RubyVM::MJIT.enabled?) && RubyVM::MJIT.enabled? + RubyVM::MJIT.resume end ENV.replace(@orig_env) -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/