From 181c8422d776bb85cb18a7023d3524307a31417c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Silva?= Date: Sun, 8 May 2011 04:20:14 +0100 Subject: explicitly return from run() under minitest (metrics were printed with the previous solution) --- activesupport/lib/active_support/testing/performance.rb | 2 ++ activesupport/lib/active_support/testing/performance/ruby.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb index 4db59680b0..4e58b6a564 100644 --- a/activesupport/lib/active_support/testing/performance.rb +++ b/activesupport/lib/active_support/testing/performance.rb @@ -51,6 +51,8 @@ module ActiveSupport end end end + + return end def run_test(metric, mode) diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb index 0d40dcd22a..3dc668cd92 100644 --- a/activesupport/lib/active_support/testing/performance/ruby.rb +++ b/activesupport/lib/active_support/testing/performance/ruby.rb @@ -10,7 +10,7 @@ module ActiveSupport module Performance DEFAULTS.merge!( if ARGV.include?('--benchmark') - {:metrics => [:wall_time, :memory, :objects, :gc_runs, :gc_time]} + { :metrics => [:wall_time, :memory, :objects, :gc_runs, :gc_time] } else { :min_percent => 0.01, :metrics => [:process_time, :memory, :objects], -- cgit v1.2.3