aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2011-03-28 00:32:21 +0100
committerGonçalo Silva <goncalossilva@gmail.com>2011-03-28 00:32:21 +0100
commit93a583eb184f0e3ba21adeab789c7d441ab98a65 (patch)
treee755955b8eb931788c9001b4ffdc37167a7e9395 /activesupport/lib/active_support
parent1a9b1edb49437076b0b9033876a7b7f57d38f4b9 (diff)
downloadrails-93a583eb184f0e3ba21adeab789c7d441ab98a65.tar.gz
rails-93a583eb184f0e3ba21adeab789c7d441ab98a65.tar.bz2
rails-93a583eb184f0e3ba21adeab789c7d441ab98a65.zip
:min_percent only makes sense in a RubyProf context
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/testing/performance.rb1
-rw-r--r--activesupport/lib/active_support/testing/performance/ruby.rb3
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 0472f44a20..ec11c60534 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -17,7 +17,6 @@ module ActiveSupport
else
{ :benchmark => false,
:runs => 1,
- :min_percent => 0.01,
:output => 'tmp/performance' }
end
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index 13dfebbece..dc77f22ba2 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -10,7 +10,8 @@ module ActiveSupport
module Performance
if !ARGV.include?('--benchmark')
DEFAULTS.merge!(
- { :metrics => [:process_time, :memory, :objects],
+ { :min_percent => 0.01,
+ :metrics => [:process_time, :memory, :objects],
:formats => [:flat, :graph_html, :call_tree] })
end