diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-02-04 17:16:25 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-06-27 20:44:08 +0200 |
| commit | 1db54d7d01ea36a9d8c0c6276d66d04a9a6c2fac (patch) | |
| tree | 360223f1b9ac96624cb070f4e884b7850b60920b /railties/lib/rails | |
| parent | 63d4894a58825e9d1fb520ec6ac663e4d8529596 (diff) | |
| download | rails-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')
| -rw-r--r-- | railties/lib/rails/commands/benchmarker.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/testing.rake | 7 |
2 files changed, 6 insertions, 4 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 = {} diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index 290005993a..8d624c6999 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -123,10 +123,13 @@ namespace :test do t.pattern = 'test/integration/**/*_test.rb' end - Rails::SubTestTask.new(:benchmark => 'test:prepare') do |t| + task 'test:benchmark_mode' do + ENV["BENCHMARK_TESTS"] = '1' + end + + Rails::SubTestTask.new(:benchmark => ['test:prepare', 'test:benchmark_mode']) do |t| t.libs << 'test' t.pattern = 'test/performance/**/*_test.rb' - t.options = '-- --benchmark' end Rails::SubTestTask.new(:profile => 'test:prepare') do |t| |