From 91c26e8e8662407a30e26c0e1c780ccfd01dbfcc Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Sun, 13 May 2012 21:08:46 +0530 Subject: [PATCH] Fixed ruby-prof changes and let's use latest ruby-prof now. --- Gemfile | 2 +- activesupport/lib/active_support/testing/performance/ruby.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 10202ca877..7a88756028 100644 --- a/Gemfile +++ b/Gemfile @@ -50,7 +50,7 @@ instance_eval File.read local_gemfile if File.exists? local_gemfile platforms :mri do group :test do - gem 'ruby-prof', '0.10.8' + gem 'ruby-prof', '~> 0.11.2' end end diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb index b7a34ea279..1104fc0a03 100644 --- a/activesupport/lib/active_support/testing/performance/ruby.rb +++ b/activesupport/lib/active_support/testing/performance/ruby.rb @@ -36,7 +36,7 @@ module ActiveSupport RubyProf.pause full_profile_options[:runs].to_i.times { run_test(@metric, :profile) } @data = RubyProf.stop - @total = @data.threads.values.sum(0) { |method_infos| method_infos.max.total_time } + @total = @data.threads.sum(0) { |thread| thread.methods.max.total_time } end def record