aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activesupport/lib/active_support/testing/performance.rb4
-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.rb0
-rw-r--r--activesupport/lib/active_support/testing/performance/ruby/yarv.rb0
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