kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Skip only .dSYM cleanup on macOS

Browse source 
Fix https://github.com/ruby/ruby/runs/636020145 without skipping too
many tests.

It seems that .c -> .o with debug flags and .o -> .so without debug
flags did not generate .dSYM but now .c -> .so with debug flags seems to
generate a .dSYM directory. As --jit-debug should not be used by normal
users, let me skip implementing the removal for now.
This commit is contained in:
Takashi Kokubun 2020-05-03 00:33:56 -07:00
parent e49ecaed57
commit e0c023d1c8
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/ruby/test_jit.rb
View file

@ -720,7 +720,7 @@ class TestJIT < Test::Unit::TestCase
skip 'Removing so file is randomly failing on AppVeyor/RubyCI mswin due to Permission Denied.' skip 'Removing so file is randomly failing on AppVeyor/RubyCI mswin due to Permission Denied.'
else else
# verify .c files are deleted on unload_units # verify .c files are deleted on unload_units
assert_send([Dir, :empty?, dir], debug_info) assert_send([Dir, :empty?, dir], debug_info) unless leave_dsym?
end end
end end
end end
@ -939,7 +939,7 @@ class TestJIT < Test::Unit::TestCase
Dir.mktmpdir("jit_test_clean_so_") do |dir| Dir.mktmpdir("jit_test_clean_so_") do |dir|
code = "x = 0; 10.times {|i|x+=i}" code = "x = 0; 10.times {|i|x+=i}"
eval_with_jit({"TMPDIR"=>dir}, code) eval_with_jit({"TMPDIR"=>dir}, code)
assert_send([Dir, :empty?, dir]) assert_send([Dir, :empty?, dir]) unless leave_dsym?
eval_with_jit({"TMPDIR"=>dir}, code, save_temps: true) eval_with_jit({"TMPDIR"=>dir}, code, save_temps: true)
assert_not_send([Dir, :empty?, dir]) assert_not_send([Dir, :empty?, dir])
end end
@ -957,7 +957,7 @@ class TestJIT < Test::Unit::TestCase
exec "true" exec "true"
end; end;
error_message = "Undeleted files:\n #{Dir.glob("#{dir}/*").join("\n ")}\n" error_message = "Undeleted files:\n #{Dir.glob("#{dir}/*").join("\n ")}\n"
assert_send([Dir, :empty?, dir], error_message) assert_send([Dir, :empty?, dir], error_message) unless leave_dsym?
end end
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) assert_equal("Successful MJIT finish\n" * 2, err.gsub(/^#{JIT_SUCCESS_PREFIX}:[^\n]+\n/, ''), debug_info)
# ensure objects are deleted # ensure objects are deleted
assert_send([Dir, :empty?, dir], debug_info) assert_send([Dir, :empty?, dir], debug_info) unless leave_dsym?
end end
end if defined?(fork) end if defined?(fork)
@ -1178,4 +1178,10 @@ class TestJIT < Test::Unit::TestCase
end end
insns insns
end end
# `clang -g` on macOS creates a .dSYM file. Because 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 end

1
test/ruby/test_jit_debug.rb
View file

@ -5,7 +5,6 @@ return if ENV.key?('APPVEYOR')
return if ENV.key?('RUBYCI_NICKNAME') return if ENV.key?('RUBYCI_NICKNAME')
return if ENV['RUBY_DEBUG']&.include?('ci') # ci.rvm.jp return if ENV['RUBY_DEBUG']&.include?('ci') # ci.rvm.jp
return if /mswin/ =~ RUBY_PLATFORM return if /mswin/ =~ RUBY_PLATFORM
return if /darwin/ =~ RUBY_PLATFORM # TODO: remove this after investigation
class TestJITDebug < TestJIT class TestJITDebug < TestJIT
def setup def setup