diff options
| -rw-r--r-- | mjit_worker.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_jit.rb | 14 |
2 files changed, 6 insertions, 11 deletions
diff --git a/mjit_worker.c b/mjit_worker.c index 49903f2cd4..63f0d64981 100644 --- a/mjit_worker.c +++ b/mjit_worker.c @@ -855,7 +855,8 @@ make_pch(void) } // Compile .c file to .so file. It returns true if it succeeds. (non-mswin) -// Not compiling .c to .so directly because it fails on MinGW. +// Not compiling .c to .so directly because it fails on MinGW, and this helps +// to generate no .dSYM on macOS. static bool compile_c_to_so(const char *c_file, const char *so_file) { diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb index 63579f27aa..a5d5fb45a9 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -720,7 +720,7 @@ class TestJIT < Test::Unit::TestCase skip 'Removing so file is randomly failing on AppVeyor/RubyCI mswin due to Permission Denied.' else # verify .c files are deleted on unload_units - assert_send([Dir, :empty?, dir], debug_info) unless leave_dsym? + assert_send([Dir, :empty?, dir], debug_info) end end end @@ -939,7 +939,7 @@ class TestJIT < Test::Unit::TestCase Dir.mktmpdir("jit_test_clean_so_") do |dir| code = "x = 0; 10.times {|i|x+=i}" eval_with_jit({"TMPDIR"=>dir}, code) - assert_send([Dir, :empty?, dir]) unless leave_dsym? + assert_send([Dir, :empty?, dir]) eval_with_jit({"TMPDIR"=>dir}, code, save_temps: true) assert_not_send([Dir, :empty?, dir]) end @@ -957,7 +957,7 @@ class TestJIT < Test::Unit::TestCase exec "true" end; error_message = "Undeleted files:\n #{Dir.glob("#{dir}/*").join("\n ")}\n" - assert_send([Dir, :empty?, dir], error_message) unless leave_dsym? + assert_send([Dir, :empty?, dir], error_message) end end @@ -1083,7 +1083,7 @@ class TestJIT < Test::Unit::TestCase assert_equal("Successful MJIT finish\n" * 2, err.gsub(/^#{JIT_SUCCESS_PREFIX}:[^\n]+\n/, ''), debug_info) # ensure objects are deleted - assert_send([Dir, :empty?, dir], debug_info) unless leave_dsym? + assert_send([Dir, :empty?, dir], debug_info) end end if defined?(fork) @@ -1178,10 +1178,4 @@ class TestJIT < Test::Unit::TestCase end insns end - - # `clang -g` on macOS creates a .dSYM directory. As it's only created on --jit-debug, - # we're ignoring it for now. TODO: remove .dSYM file - def leave_dsym? - /darwin/ =~ RUBY_PLATFORM && @jit_debug - end end |