aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-01-09 18:58:38 -0800
committerYehuda Katz <wycats@gmail.com>2009-01-09 18:58:47 -0800
commite8980ad278923e07eb1626908f40608db7f7a6ff (patch)
treef9b711d1f811b0e787a70ad2415f0189883f121d /activesupport
parentbb03719943ee5f8e357323f35aa7ffd083938fc2 (diff)
parent40a75a509187b6759099a3644b7ae8db9fc14045 (diff)
downloadrails-e8980ad278923e07eb1626908f40608db7f7a6ff.tar.gz
rails-e8980ad278923e07eb1626908f40608db7f7a6ff.tar.bz2
rails-e8980ad278923e07eb1626908f40608db7f7a6ff.zip
Sync 'rails/rails/master'
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/performance.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index bd136c2596..f8d12e82b3 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -12,7 +12,7 @@ module ActiveSupport
if benchmark = ARGV.include?('--benchmark') # HAX for rake test
{ :benchmark => true,
:runs => 4,
- :metrics => [:process_time, :memory, :objects, :gc_runs, :gc_time],
+ :metrics => [:wall_time, :memory, :objects, :gc_runs, :gc_time],
:output => 'tmp/performance' }
else
{ :benchmark => false,