From 5ced9a4395b2eca37662df20f5a35abbede58898 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 10 Sep 2009 12:21:48 +0000 Subject: * 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 --- ChangeLog | 5 +++++ test/ruby/envutil.rb | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f1f5dbd91..3392ea7e97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 10 21:20:59 2009 Tanaka Akira + + * test/ruby/envutil.rb (assert_normal_exit): Don't use + AssertionMessage. + Thu Sep 10 15:59:05 2009 NARUSE, Yui * 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? } -- cgit v1.2.3