[前][次][番号順一覧][スレッド一覧]

ruby-changes:27852

From: nobu <ko1@a...>
Date: Sun, 24 Mar 2013 19:43:50 +0900 (JST)
Subject: [ruby-changes:27852] nobu:r39905 (trunk): * test/ruby/envutil.rb (assert_ruby_status): include stderr output.

nobu	2013-03-24 19:43:39 +0900 (Sun, 24 Mar 2013)

  New Revision: 39905

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

  Log:
    * test/ruby/envutil.rb (assert_ruby_status): include stderr output.

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

Index: test/ruby/envutil.rb
===================================================================
--- test/ruby/envutil.rb	(revision 39904)
+++ test/ruby/envutil.rb	(revision 39905)
@@ -268,9 +268,9 @@ module Test https://github.com/ruby/ruby/blob/trunk/test/ruby/envutil.rb#L268
       end
 
       def assert_ruby_status(args, test_stdin="", message=nil, opt={})
-        _, _, status = EnvUtil.invoke_ruby(args, test_stdin, false, false, opt)
-        m = message ? "#{message} (#{status.inspect})" : "ruby exit status is not success: #{status.inspect}"
-        assert(status.success?, m)
+        out, _, status = EnvUtil.invoke_ruby(args, test_stdin, true, :merge_to_stdout, opt)
+        message ||= "ruby exit status is not success:"
+        assert(status.success?, FailDesc[status, message, out])
       end
 
       ABORT_SIGNALS = Signal.list.values_at(*%w"ILL ABRT BUS SEGV")

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

[前][次][番号順一覧][スレッド一覧]