From bc2195e4fbf7281af3a0bd055d4263690d7aad9f Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 14 Dec 2012 01:38:07 +0000
Subject: [PATCH] * test/ruby/envutil.rb
 (EnvUtil::Unit::Assertionsassert_separately):   added to execute given test
 source on separate process,   catch its resulted exception and raise it on
 main process.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38369 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            |  6 ++++++
 test/ruby/envutil.rb | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e77efc90bf..a2ed0724fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 14 04:08:05 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/envutil.rb (EnvUtil::Unit::Assertionsassert_separately):
+	  added to execute given test source on separate process,
+	  catch its resulted exception and raise it on main process.
+
 Fri Dec 14 07:43:44 2012  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych/visitors/yaml_tree.rb: quote strings that begin
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 657e991e3f..edcda0ceba 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -193,6 +193,23 @@ module Test
         assert(status.success?, m)
       end
 
+      def assert_separately(args, file, line, src)
+        opt = {}
+        src = <<eom
+  require 'test/unit';include Test::Unit::Assertions;begin;#{src}
+  ensure
+    print [Marshal.dump($!)].pack('m')
+  end
+eom
+        stdout, _stderr, _status = EnvUtil.invoke_ruby(args, src, true, true, opt)
+        res = Marshal.load(stdout.unpack("m")[0])
+        return unless res
+        res.backtrace.each do |l|
+          l.sub!(/\A-:(\d+)/){"#{file}:#{line + $1.to_i}"}
+        end
+        raise res
+      end
+
       def assert_warning(pat, message = nil)
         stderr = EnvUtil.verbose_warning { yield }
         message = ' "' + message + '"' if message