From 12bf1de1dda78e8fb69d7cc1dda24e7e09eb8806 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 4 Apr 2013 08:23:16 +0000 Subject: envutil.rb: assert stderr if marshal failed * test/ruby/envutil.rb (assert_separately): force to assert stderr to be empty if marshal failed, as something is emitted probably. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/envutil.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'test/ruby') diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 0ae5119ff6..7a5356331a 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -298,7 +298,11 @@ eom abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig)) assert(!abort, FailDesc[status, stderr]) self._assertions += stdout[/^assertions=(\d+)/, 1].to_i - res = Marshal.load(stdout.unpack("m")[0]) + begin + res = Marshal.load(stdout.unpack("m")[0]) + rescue => marshal_error + ignore_stderr = nil + end if res res.backtrace.each do |l| l.sub!(/\A-:(\d+)/){"#{file}:#{line + $1.to_i}"} @@ -312,6 +316,7 @@ eom assert_equal("", stderr, "assert_separately failed with error message") end assert_equal(0, status, "assert_separately failed: '#{stderr}'") + raise marshal_error if marshal_error end def assert_warning(pat, msg = nil) -- cgit v1.2.3