diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-06-27 12:55:36 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-06-27 12:55:36 -0700 |
| commit | 0a55bd7c6bdc4c3022cec858e341f7561ec8554b (patch) | |
| tree | 90dc22392fdcd324a9d50961577573abdb5bd53b /railties/lib/rails/commands | |
| parent | 63d4894a58825e9d1fb520ec6ac663e4d8529596 (diff) | |
| parent | b47f8d035ec6a38a69eb5b3bdb1e27bb40e574c7 (diff) | |
| download | rails-0a55bd7c6bdc4c3022cec858e341f7561ec8554b.tar.gz rails-0a55bd7c6bdc4c3022cec858e341f7561ec8554b.tar.bz2 rails-0a55bd7c6bdc4c3022cec858e341f7561ec8554b.zip | |
Merge pull request #9173 from senny/backport_perftest_fix
Backport rails/rails-perftest#2 to fix rake test:benchmark
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/benchmarker.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/commands/profiler.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb index b745b45e17..a2d92f8956 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 = {} @@ -31,4 +30,5 @@ class BenchmarkerTest < ActionDispatch::PerformanceTest #:nodoc: end RUBY end + ARGV.clear end diff --git a/railties/lib/rails/commands/profiler.rb b/railties/lib/rails/commands/profiler.rb index 3f6966b4f0..9b3b4f41f6 100644 --- a/railties/lib/rails/commands/profiler.rb +++ b/railties/lib/rails/commands/profiler.rb @@ -29,4 +29,5 @@ class ProfilerTest < ActionDispatch::PerformanceTest #:nodoc: end RUBY end + ARGV.clear end |