summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-14 06:22:02 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-14 06:22:02 +0000
commit505d2d7ff6599ae77b66643594892096619b7c2f (patch)
tree0227e4bb54450bc15997764166240c4a8a5011a5
parent503badb5d14cc7d7b1d0fcd6d148d441d923f83e (diff)
merge revision(s) 44772,44773: [Backport #9430]
benchmark/driver: avoid large alloc in driver process * benchmark/driver: avoid large alloc in driver process [ruby-core:59869] [Bug #9430] * benchmark/driver: avoid large alloc in driver process [ruby-core:59869] [Bug #9430] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--benchmark/driver.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a2788b144..7cb5a9b370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 14 15:21:21 2014 Eric Wong <e@80x24.org>
+
+ * benchmark/driver: avoid large alloc in driver process
+ [ruby-core:59869] [Bug #9430]
+
Fri Feb 14 15:17:17 2014 Yusuke Endoh <mame@tsg.ne.jp>
* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
index 7dab292a15..4028110659 100644
--- a/benchmark/driver.rb
+++ b/benchmark/driver.rb
@@ -220,7 +220,7 @@ class BenchmarkDriver
def measure executable, file
cmd = "#{executable} #{file}"
m = Benchmark.measure{
- `#{cmd}`
+ system(cmd, out: File::NULL)
}
if $? != 0
diff --git a/version.h b/version.h
index 2dbc4c3c87..40dcfcde94 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 523
+#define RUBY_PATCHLEVEL 524
#define RUBY_RELEASE_DATE "2014-02-14"
#define RUBY_RELEASE_YEAR 2014