summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-12 18:13:06 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-12 18:13:06 +0000
commite445f1c6843f6b9bca47084fefd8ef751a70cc98 (patch)
tree9a90b5016f0c41d27fae344664da9aa3880eceef
parentf2c7a874a76dd113e088496220f2498e6223e721 (diff)
* test/benchmark/test_benchmark.rb (capture_output):
replace '-' as space. On NetBSD, subtract between two Process.times after and before the short process may return negative value like: t0=Process.times; yield; t1=Process.times; p t1.utime-t0.utime git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--test/benchmark/test_benchmark.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c9a4cd2726..98f6c9855f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 13 03:07:38 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * test/benchmark/test_benchmark.rb (capture_output):
+ replace '-' as space. On NetBSD, subtract between two Process.times
+ after and before the short process may return negative value like:
+ t0=Process.times; yield; t1=Process.times; p t1.utime-t0.utime
+
Mon Jun 13 02:40:23 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* test/openssl/test_pkey_dsa.rb: Test for DSA#syssign/sysverify.
diff --git a/test/benchmark/test_benchmark.rb b/test/benchmark/test_benchmark.rb
index 8e369fdb1f..b34884fdc6 100644
--- a/test/benchmark/test_benchmark.rb
+++ b/test/benchmark/test_benchmark.rb
@@ -36,7 +36,7 @@ describe Benchmark do
end
def capture_output
- capture_io { yield }.first.gsub(/\d\.\d{6}/, '--time--')
+ capture_io { yield }.first.gsub(/[ \-]\d\.\d{6}/, ' --time--')
end
def capture_bench_output(type, *args, &block)