From 1db54d7d01ea36a9d8c0c6276d66d04a9a6c2fac Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Mon, 4 Feb 2013 17:16:25 +0100 Subject: Backport rails/rails-perftest#2 to fix rake test:benchmark --- railties/CHANGELOG.md | 5 +++++ railties/lib/rails/commands/benchmarker.rb | 3 +-- railties/lib/rails/test_unit/testing.rake | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'railties') diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 4bb2ec4618..9ecb37e903 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -21,6 +21,11 @@ * No changes. +* Fix launching performance tests through rake `test:benchmark`. + Fixes #4938. + Backport rails/rails-perftest#2. + + *Dmitry Vorotilin + Yves Senn* ## Rails 3.2.11 (Jan 8, 2013) ## 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| -- cgit v1.2.3