diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2010-06-12 11:29:26 +0100 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-17 19:18:52 -0700 |
| commit | 381a30fbba6ccca0bf2e7e2bc007ea5e6848af62 (patch) | |
| tree | d971ba84883261b0eb5e4a40765729360b44ef41 | |
| parent | bf6661c5d75d8e29ebd5f6011f97a85c892663a0 (diff) | |
| download | rails-381a30fbba6ccca0bf2e7e2bc007ea5e6848af62.tar.gz rails-381a30fbba6ccca0bf2e7e2bc007ea5e6848af62.tar.bz2 rails-381a30fbba6ccca0bf2e7e2bc007ea5e6848af62.zip | |
don't set cpu_frequency if RubyProf resolved it
| -rw-r--r-- | activesupport/lib/active_support/testing/performance.rb | 4 |
1 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 24eea1e40b..6e51dbb735 100644 --- a/activesupport/lib/active_support/testing/performance.rb +++ b/activesupport/lib/active_support/testing/performance.rb @@ -319,7 +319,7 @@ begin def initialize(*args) # FIXME: yeah my CPU is 2.33 GHz - RubyProf.cpu_frequency = 2.33e9 + RubyProf.cpu_frequency = 2.33e9 unless RubyProf.cpu_frequency > 0 super end @@ -452,4 +452,4 @@ begin end end rescue LoadError -end
\ No newline at end of file +end |