diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-25 02:59:11 +0000 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-25 03:21:01 +0000 |
| commit | 3ec79e4288df602301e26ae7b2f2b651ff745862 (patch) | |
| tree | dec497977969a419742be7689f4510bff614674e /activesupport/lib | |
| parent | 18a81db6fca2994d2c3872b0cb6bfa78bb94b383 (diff) | |
| download | rails-3ec79e4288df602301e26ae7b2f2b651ff745862.tar.gz rails-3ec79e4288df602301e26ae7b2f2b651ff745862.tar.bz2 rails-3ec79e4288df602301e26ae7b2f2b651ff745862.zip | |
renamed "mri" to "ruby", for consistency with RUBY_ENGINE
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/testing/performance.rb | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/performance/ruby.rb (renamed from activesupport/lib/active_support/testing/performance/mri.rb) | 0 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/performance/ruby/mri.rb | 0 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/performance/ruby/yarv.rb | 0 |
4 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 351835553f..a7faf6267a 100644 --- a/activesupport/lib/active_support/testing/performance.rb +++ b/activesupport/lib/active_support/testing/performance.rb @@ -271,9 +271,9 @@ module ActiveSupport end end -RUBY_ENGINE ||= "ruby" +RUBY_ENGINE = "ruby" unless defined?(RUBY_ENGINE) case RUBY_ENGINE - when "ruby" then require 'active_support/testing/performance/mri' + when "ruby" then require 'active_support/testing/performance/ruby' else $stderr.puts "Your ruby interpreter is not supported for benchmarking." exit diff --git a/activesupport/lib/active_support/testing/performance/mri.rb b/activesupport/lib/active_support/testing/performance/ruby.rb index 859588c735..859588c735 100644 --- a/activesupport/lib/active_support/testing/performance/mri.rb +++ b/activesupport/lib/active_support/testing/performance/ruby.rb diff --git a/activesupport/lib/active_support/testing/performance/ruby/mri.rb b/activesupport/lib/active_support/testing/performance/ruby/mri.rb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/activesupport/lib/active_support/testing/performance/ruby/mri.rb diff --git a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb |