aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing/performance.rb
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2011-03-26 19:12:04 +0000
committerGonçalo Silva <goncalossilva@gmail.com>2011-03-26 19:34:59 +0000
commit84fe2b8b4266f5ef4e3e5f2880a18b8e44a070f0 (patch)
tree7ab4da8ac3ba0ccf751bd2d8f21ee787ade47f69 /activesupport/lib/active_support/testing/performance.rb
parent3872cc4a739db7e0fb5b4a910be371c048667ca7 (diff)
downloadrails-84fe2b8b4266f5ef4e3e5f2880a18b8e44a070f0.tar.gz
rails-84fe2b8b4266f5ef4e3e5f2880a18b8e44a070f0.tar.bz2
rails-84fe2b8b4266f5ef4e3e5f2880a18b8e44a070f0.zip
added basic structure for jruby
Diffstat (limited to 'activesupport/lib/active_support/testing/performance.rb')
-rw-r--r--activesupport/lib/active_support/testing/performance.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index bba05d0a51..0472f44a20 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -111,6 +111,10 @@ module ActiveSupport
# overridden by each implementation
class Profiler < Performer
+ def initialize(*args)
+ super
+ end
+
def run; end
def report; end
def record; end
@@ -272,8 +276,9 @@ end
RUBY_ENGINE = 'ruby' unless defined?(RUBY_ENGINE) # mri 1.8
case RUBY_ENGINE
- when 'ruby' then require 'active_support/testing/performance/ruby'
- when 'rbx' then require 'active_support/testing/performance/rubinius'
+ when 'ruby' then require 'active_support/testing/performance/ruby'
+ when 'rbx' then require 'active_support/testing/performance/rubinius'
+ when 'jruby' then require 'active_support/testing/performance/jruby'
else
$stderr.puts 'Your ruby interpreter is not supported for benchmarking.'
exit