summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-24 10:43:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-24 10:43:39 +0000
commitf001a450f2263a74cc38e650361da161305d776f (patch)
tree40ae3252e0c57cb25d076fc1fbc73a992b0b4424 /test
parentcedfed5e8d6371c66f9f664e0c49f5d051dad033 (diff)
* test/ruby/envutil.rb (assert_ruby_status): include stderr output.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/envutil.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 85116fdac0..80e43346d9 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -268,9 +268,9 @@ module Test
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")