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

* test/ruby/envutil.rb (assert_normal_exit): Don't use

AssertionMessage.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-09-10 12:21:48 +00:00
parent a87ce30453
commit 5ced9a4395
2 changed files with 11 additions and 7 deletions

View file

@ -1,3 +1,8 @@
Thu Sep 10 21:20:59 2009 Tanaka Akira <akr@fsij.org>
* test/ruby/envutil.rb (assert_normal_exit): Don't use
AssertionMessage.
Thu Sep 10 15:59:05 2009 NARUSE, Yui <naruse@ruby-lang.org> Thu Sep 10 15:59:05 2009 NARUSE, Yui <naruse@ruby-lang.org>
* regparse.c (UNKNOWN_ESC_WARN): added. * regparse.c (UNKNOWN_ESC_WARN): added.

View file

@ -94,16 +94,15 @@ module Test
if status.coredump? if status.coredump?
sigdesc << " (core dumped)" sigdesc << " (core dumped)"
end end
full_message = ''
if !message.empty?
full_message << message << "\n"
end
if msg.empty? if msg.empty?
full_message = build_message(message, "pid ? killed by ?", full_message << "pid #{pid} killed by #{sigdesc}"
pid,
AssertionMessage::Literal.new(sigdesc))
else else
msg << "\n" if /\n\z/ !~ msg msg << "\n" if /\n\z/ !~ msg
full_message = build_message(message, "pid ? killed by ?\n?", full_message << "pid #{pid} killed by #{sigdesc}\n#{msg.gsub(/^/, '| ')}"
pid,
AssertionMessage::Literal.new(sigdesc),
AssertionMessage::Literal.new(msg.gsub(/^/, '| ')))
end end
end end
assert_block(full_message) { !status.signaled? } assert_block(full_message) { !status.signaled? }