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

Add unique token to separated runner

Browse source 
Same as Test::Unit::CoreAssertions#assert_no_memory_leak.
This commit is contained in:
Nobuyoshi Nakada 2021-09-13 15:47:45 +09:00
parent dbdceb8a19
commit aaa9805e7e
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tool/lib/core_assertions.rb
View file

@ -105,9 +105,7 @@ module Test
require_relative 'memory_status' require_relative 'memory_status'
raise Test::Unit::PendedError, "unsupported platform" unless defined?(Memory::Status) raise Test::Unit::PendedError, "unsupported platform" unless defined?(Memory::Status)
token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m" token_dump, token_re = new_test_token
token_dump = token.dump
token_re = Regexp.quote(token)
envs = args.shift if Array === args and Hash === args.first envs = args.shift if Array === args and Hash === args.first
args = [ args = [
"--disable=gems", "--disable=gems",
@ -244,11 +242,11 @@ module Test
ABORT_SIGNALS = Signal.list.values_at(*%w"ILL ABRT BUS SEGV TERM") ABORT_SIGNALS = Signal.list.values_at(*%w"ILL ABRT BUS SEGV TERM")
def separated_runner(out = nil) def separated_runner(token, out = nil)
include(*Test::Unit::TestCase.ancestors.select {|c| !c.is_a?(Class) }) include(*Test::Unit::TestCase.ancestors.select {|c| !c.is_a?(Class) })
out = out ? IO.new(out, 'w') : STDOUT out = out ? IO.new(out, 'w') : STDOUT
at_exit { at_exit {
out.puts [Marshal.dump($!)].pack('m'), "assertions=#{self._assertions}" out.puts "#{token}<error>", [Marshal.dump($!)].pack('m'), "#{token}</error>", "#{token}assertions=#{self._assertions}"
} }
Test::Unit::Runner.class_variable_set(:@@stop_auto_run, true) if defined?(Test::Unit::Runner) Test::Unit::Runner.class_variable_set(:@@stop_auto_run, true) if defined?(Test::Unit::Runner)
end end
@ -266,11 +264,12 @@ module Test
res_p, res_c = IO.pipe res_p, res_c = IO.pipe
opt[:ios] = [res_c] opt[:ios] = [res_c]
end end
token_dump, token_re = new_test_token
src = <<eom src = <<eom
# -*- coding: #{line += __LINE__; src.encoding}; -*- # -*- coding: #{line += __LINE__; src.encoding}; -*-
BEGIN { BEGIN {
require "test/unit";include Test::Unit::Assertions;include Test::Unit::CoreAssertions;require #{__FILE__.dump} require "test/unit";include Test::Unit::Assertions;include Test::Unit::CoreAssertions;require #{__FILE__.dump}
separated_runner #{res_c&.fileno} separated_runner #{token_dump}, #{res_c&.fileno || 'nil'}
} }
#{line -= __LINE__; src} #{line -= __LINE__; src}
eom eom
@ -288,9 +287,9 @@ eom
raise if $! raise if $!
abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig)) abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig))
assert(!abort, FailDesc[status, nil, stderr]) assert(!abort, FailDesc[status, nil, stderr])
self._assertions += res[/^assertions=(\d+)/, 1].to_i self._assertions += res[/^#{token_re}assertions=(\d+)/, 1].to_i
begin begin
res = Marshal.load(res.unpack1("m")) res = Marshal.load(res[/^#{token_re}<error>\n\K.*\n(?=#{token_re}<\/error>$)/m].unpack1("m"))
rescue => marshal_error rescue => marshal_error
ignore_stderr = nil ignore_stderr = nil
res = nil res = nil
@ -763,6 +762,11 @@ eom
end end
q.output q.output
end end
def new_test_token
token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m"
return token.dump, Regexp.quote(token)
end
end end
end end
end end