diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-10 12:21:48 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-10 12:21:48 +0000 |
commit | 5ced9a4395b2eca37662df20f5a35abbede58898 (patch) | |
tree | 34b86b67ea58a8f0c2aba1c65f52a7c4a582d546 | |
parent | a87ce30453898db7f6caa135be86465ea4c2a111 (diff) | |
download | ruby-5ced9a4395b2eca37662df20f5a35abbede58898.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/envutil.rb | 13 |
2 files changed, 11 insertions, 7 deletions
@@ -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> * regparse.c (UNKNOWN_ESC_WARN): added. diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 6900d03b70..3aeb54f935 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -94,16 +94,15 @@ module Test if status.coredump? sigdesc << " (core dumped)" end + full_message = '' + if !message.empty? + full_message << message << "\n" + end if msg.empty? - full_message = build_message(message, "pid ? killed by ?", - pid, - AssertionMessage::Literal.new(sigdesc)) + full_message << "pid #{pid} killed by #{sigdesc}" else msg << "\n" if /\n\z/ !~ msg - full_message = build_message(message, "pid ? killed by ?\n?", - pid, - AssertionMessage::Literal.new(sigdesc), - AssertionMessage::Literal.new(msg.gsub(/^/, '| '))) + full_message << "pid #{pid} killed by #{sigdesc}\n#{msg.gsub(/^/, '| ')}" end end assert_block(full_message) { !status.signaled? } |