diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/envutil.rb | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -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| |