aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing/performance/ruby.rb
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2011-03-28 01:32:56 +0100
committerGonçalo Silva <goncalossilva@gmail.com>2011-03-28 01:32:56 +0100
commite6cb3962bb51aa1f91487117b99e660cc2c43e37 (patch)
treeeb470665aa4fa677ef85b27e98b831d233c8746a /activesupport/lib/active_support/testing/performance/ruby.rb
parente17f60879782b3b0d8a4bc2444e1d024c65ec59e (diff)
downloadrails-e6cb3962bb51aa1f91487117b99e660cc2c43e37.tar.gz
rails-e6cb3962bb51aa1f91487117b99e660cc2c43e37.tar.bz2
rails-e6cb3962bb51aa1f91487117b99e660cc2c43e37.zip
benchmarking metrics are also implementation-specific
Diffstat (limited to 'activesupport/lib/active_support/testing/performance/ruby.rb')
-rw-r--r--activesupport/lib/active_support/testing/performance/ruby.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index dc77f22ba2..b36b201531 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -8,7 +8,9 @@ end
module ActiveSupport
module Testing
module Performance
- if !ARGV.include?('--benchmark')
+ if ARGV.include?('--benchmark')
+ DEFAULTS.merge!({:metrics => [:wall_time, :memory, :objects, :gc_runs, :gc_time]})
+ else
DEFAULTS.merge!(
{ :min_percent => 0.01,
:metrics => [:process_time, :memory, :objects],