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/test_unit | |
| 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/test_unit')
| -rw-r--r-- | railties/lib/rails/test_unit/testing.rake | 7 |
1 files changed, 5 insertions, 2 deletions
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| |