From 2bd5113c8c91977c231dc5f806d0396c4ea0b3f8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 14 Dec 2012 05:58:41 +0000
Subject: envutil.rb: count assertions

* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
  count assertions in separated tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            | 5 +++++
 test/ruby/envutil.rb | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 612048f5af..c90c50611b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 14 14:58:37 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
+	  count assertions in separated tests.
+
 Fri Dec 14 14:16:42 2012  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc/rubygems_hook.rb:  Fixed generation of documentation.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index edcda0ceba..dcdd857798 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -198,10 +198,11 @@ module Test
         src = <<eom
   require 'test/unit';include Test::Unit::Assertions;begin;#{src}
   ensure
-    print [Marshal.dump($!)].pack('m')
+    puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}"
   end
 eom
         stdout, _stderr, _status = EnvUtil.invoke_ruby(args, src, true, true, opt)
+        self._assertions += stdout[/^assertions=(\d+)/, 1].to_i
         res = Marshal.load(stdout.unpack("m")[0])
         return unless res
         res.backtrace.each do |l|
-- 
cgit v1.2.3