diff options
| author | Miguel Camba <miguel.camba@gmail.com> | 2011-12-27 07:52:41 +0100 |
|---|---|---|
| committer | Miguel Camba <miguel.camba@gmail.com> | 2011-12-27 07:52:41 +0100 |
| commit | 971d257cddd271e1faec8ae1762915c4c27b2908 (patch) | |
| tree | 32f6abd944b4683f722e73a39c935510ea1b0915 /activesupport/lib/active_support/testing | |
| parent | 3e4d0daedfdf1e041fcf13e896a273556e426b64 (diff) | |
| download | rails-971d257cddd271e1faec8ae1762915c4c27b2908.tar.gz rails-971d257cddd271e1faec8ae1762915c4c27b2908.tar.bz2 rails-971d257cddd271e1faec8ae1762915c4c27b2908.zip | |
Removed RUBY_ENGINE checks for ruby18
Diffstat (limited to 'activesupport/lib/active_support/testing')
| -rw-r--r-- | activesupport/lib/active_support/testing/performance.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb index 6236908711..209bfac19f 100644 --- a/activesupport/lib/active_support/testing/performance.rb +++ b/activesupport/lib/active_support/testing/performance.rb @@ -161,8 +161,7 @@ module ActiveSupport end end - ruby = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby' - ruby += "-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}" + ruby = "#{RUBY_ENGINE}-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}" @env = [app, rails, ruby, RUBY_PLATFORM] * ',' end @@ -259,7 +258,6 @@ module ActiveSupport end 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' |