[前][次][番号順一覧][スレッド一覧]

ruby-changes:73094

From: Yusuke <ko1@a...>
Date: Mon, 29 Aug 2022 20:25:46 +0900 (JST)
Subject: [ruby-changes:73094] 4bc782ed87 (master): Revert "Chect what remains in TMPDIR"

https://git.ruby-lang.org/ruby.git/commit/?id=4bc782ed87

From 4bc782ed87d05d251d1656ca08e176f8bb56a448 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Mon, 29 Aug 2022 20:23:51 +0900
Subject: Revert "Chect what remains in TMPDIR"

This reverts commit 7bdb999d0f28c7bb9d7a35ca775e405674527e5f.

I think I confirmed the mechanism. GCC (invoked by MJIT) creates a
temporary file in TMPDIR, which prevents rm_rf from removing the
directory.
---
 test/rubygems/helper.rb | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index 29d3924eba..37e113d3fc 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -466,18 +466,13 @@ class Gem::TestCase < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/helper.rb#L466
     Dir.chdir @current_dir
 
     # Prevent a race condition on removing TMPDIR being written by MJIT
-    #if defined?(RubyVM::MJIT.enabled?) && RubyVM::MJIT.enabled?
-    #  RubyVM::MJIT.pause(wait: false)
-    #end
-    begin
-      FileUtils.rm_rf @tempdir
-    ensure
-      # mame: Temporal code for debugging. Let me confirm what remains in the directory
-      pp Dir.glob(File.join(@tempdir, "**", "{.*,*}")) if $!
-    end
-    #if defined?(RubyVM::MJIT.enabled?) && RubyVM::MJIT.enabled?
-    #  RubyVM::MJIT.resume
-    #end
+    if defined?(RubyVM::MJIT.enabled?) && RubyVM::MJIT.enabled?
+      RubyVM::MJIT.pause(wait: false)
+    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/

[前][次][番号順一覧][スレッド一覧]