Merge pull request #4199 from cibernox/patch-1

Removed RUBY_ENGINE checks for ruby18
rails · Dec 27, 2011 · 2545275 · 2545275
2 parents 3e4d0da + 971d257
commit 2545275
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
@@ -161,8 +161,7 @@ def environment
               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 @@ def format(measurement)
   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'