aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands/benchmarker.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-02-04 17:16:25 +0100
committerYves Senn <yves.senn@gmail.com>2013-06-27 20:44:08 +0200
commit1db54d7d01ea36a9d8c0c6276d66d04a9a6c2fac (patch)
tree360223f1b9ac96624cb070f4e884b7850b60920b /railties/lib/rails/commands/benchmarker.rb
parent63d4894a58825e9d1fb520ec6ac663e4d8529596 (diff)
downloadrails-1db54d7d01ea36a9d8c0c6276d66d04a9a6c2fac.tar.gz
rails-1db54d7d01ea36a9d8c0c6276d66d04a9a6c2fac.tar.bz2
rails-1db54d7d01ea36a9d8c0c6276d66d04a9a6c2fac.zip
Backport rails/rails-perftest#2 to fix rake test:benchmark
Diffstat (limited to 'railties/lib/rails/commands/benchmarker.rb')
-rw-r--r--railties/lib/rails/commands/benchmarker.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb
index b745b45e17..b9169468a3 100644
--- a/railties/lib/rails/commands/benchmarker.rb
+++ b/railties/lib/rails/commands/benchmarker.rb
@@ -2,9 +2,8 @@ require 'optparse'
require 'rails/test_help'
require 'rails/performance_test_help'
-ARGV.push('--benchmark') # HAX
+ENV["BENCHMARK_TESTS"] = '1'
require 'active_support/testing/performance'
-ARGV.pop
def options
options = {}