diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 04:20:14 +0100 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 04:20:14 +0100 |
| commit | 181c8422d776bb85cb18a7023d3524307a31417c (patch) | |
| tree | c484ee3f507e0e4f42e0e04f15383da6fdabb913 /activesupport/lib | |
| parent | aec7456f81985b88d6d604679d754636183b5b3a (diff) | |
| download | rails-181c8422d776bb85cb18a7023d3524307a31417c.tar.gz rails-181c8422d776bb85cb18a7023d3524307a31417c.tar.bz2 rails-181c8422d776bb85cb18a7023d3524307a31417c.zip | |
explicitly return from run() under minitest (metrics were printed with the previous solution)
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/testing/performance.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/performance/ruby.rb | 2 |
2 files changed, 3 insertions, 1 deletions
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], |