aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2011-05-10 02:39:05 +0100
committerGonçalo Silva <goncalossilva@gmail.com>2011-05-10 02:39:05 +0100
commit83b66f5af4190043610dd7ab0e095b2093798813 (patch)
treeb1f88035b49bcd2473be6326a18447445051decf
parentdcc99e23cddab727fec2f7026bc30be18b07cee0 (diff)
parent810fb2b5273591ff396ae9bcc1cf78b5d575c33d (diff)
downloadrails-83b66f5af4190043610dd7ab0e095b2093798813.tar.gz
rails-83b66f5af4190043610dd7ab0e095b2093798813.tar.bz2
rails-83b66f5af4190043610dd7ab0e095b2093798813.zip
Merge branch 'performance_test' of github.com:goncalossilva/rails into performance_test
-rw-r--r--activesupport/lib/active_support/testing/performance.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index f0287b0440..4e970c034f 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -28,6 +28,7 @@ module ActiveSupport
:output => 'tmp/performance',
:benchmark => true }
else
+ puts "not"
{ :runs => 1,
:output => 'tmp/performance',
:benchmark => false }