akr	2009-09-10 21:21:48 +0900 (Thu, 10 Sep 2009)

  New Revision: 24827

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24827

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

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/envutil.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24826)
+++ ChangeLog	(revision 24827)
@@ -1,3 +1,8 @@
+Thu Sep 10 21:20:59 2009  Tanaka Akira  <akr@f...>
+
+	* test/ruby/envutil.rb (assert_normal_exit): Don't use
+	  AssertionMessage.
+
 Thu Sep 10 15:59:05 2009  NARUSE, Yui  <naruse@r...>
 
 	* regparse.c (UNKNOWN_ESC_WARN): added.
Index: test/ruby/envutil.rb
===================================================================
--- test/ruby/envutil.rb	(revision 24826)
+++ test/ruby/envutil.rb	(revision 24827)
@@ -94,16 +94,15 @@
           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? }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/